From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 4 Jun 2014 03:48:51 +0000 (-0400)
Subject: Merge branch 'branch3.2'
X-Git-Tag: v4.0.0b1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a5e4ced99e4bac3629e0d7f0e7f1f3bb39a144;p=thirdparty%2Ftornado.git

Merge branch 'branch3.2'

Conflicts:
	docs/releases.rst
	setup.py
	tornado/__init__.py
	tornado/websocket.py
---

72a5e4ced99e4bac3629e0d7f0e7f1f3bb39a144
diff --cc docs/releases.rst
index 93eaf4c6f,2b1fad955..155c66a4a
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@@ -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 tornado/web.py
index 5a875fd96,9fe2f77b9..dd2b5ef51
--- a/tornado/web.py
+++ b/tornado/web.py
@@@ -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
diff --cc tornado/websocket.py
index 3767a207d,ff78552ce..c0065c794
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@@ -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.tcpclient import TCPClient
- from tornado.util import bytes_type, unicode_type
+ 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