]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge branch 'branch3.2'
authorBen Darnell <ben@bendarnell.com>
Wed, 4 Jun 2014 03:48:51 +0000 (23:48 -0400)
committerBen Darnell <ben@bendarnell.com>
Wed, 4 Jun 2014 03:48:51 +0000 (23:48 -0400)
Conflicts:
docs/releases.rst
setup.py
tornado/__init__.py
tornado/websocket.py

1  2 
docs/releases.rst
docs/web.rst
tornado/test/web_test.py
tornado/test/websocket_test.py
tornado/util.py
tornado/web.py
tornado/websocket.py

index 93eaf4c6fd41b8f708a2ec79a805421ee907ddf6,2b1fad9550e4b8484fd2821a3bddba1761da12d0..155c66a4a6cb4418771d22f1135f9552fc76ab15
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v3.2.2
     releases/v3.2.1
     releases/v3.2.0
     releases/v3.1.1
diff --cc docs/web.rst
Simple merge
Simple merge
Simple merge
diff --cc tornado/util.py
Simple merge
diff --cc tornado/web.py
index 5a875fd965531a4dceb07596a554b07db7a74d35,9fe2f77b90b9f1ca1eb4ebbd2c9043d34bdcd0ab..dd2b5ef51371cc3747c8dee04a1261f964920277
@@@ -72,13 -72,10 +72,12 @@@ import tim
  import tornado
  import traceback
  import types
- import uuid
  
 -from tornado.concurrent import Future
 +from tornado.concurrent import Future, is_future
  from tornado import escape
 +from tornado import gen
  from tornado import httputil
 +from tornado import iostream
  from tornado import locale
  from tornado.log import access_log, app_log, gen_log
  from tornado import stack_context
index 3767a207d4a6ccb8bc0fd9dbf02c7d78c557a8de,ff78552ce8f14184f9c20729506d5adccea450a8..c0065c7941b27ab9750f56bffaf261c94ef6f933
@@@ -37,20 -36,10 +36,20 @@@ from tornado import httpclient, httputi
  from tornado.ioloop import IOLoop
  from tornado.iostream import StreamClosedError
  from tornado.log import gen_log, app_log
 -from tornado.netutil import Resolver
  from tornado import simple_httpclient
- from tornado.util import bytes_type, unicode_type
 +from tornado.tcpclient import TCPClient
+ from tornado.util import bytes_type, unicode_type, _websocket_mask
  
 +try:
 +    from urllib.parse import urlparse # py2
 +except ImportError:
 +    from urlparse import urlparse # py3
 +
 +try:
 +    xrange  # py2
 +except NameError:
 +    xrange = range  # py3
 +
  
  class WebSocketError(Exception):
      pass