The next version will be 4.0, not 3.3, so update all references to 3.3.

setup.py

@@ -108,7 +108,7 @@ def build_extension(self, ext):
 
 kwargs = {}
 
-version = "3.3.dev1"
+version = "4.0.dev1"
 
 with open('README.rst') as f:
     kwargs['long_description'] = f.read()

tornado/__init__.py

@@ -25,5 +25,5 @@
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version = "3.3.dev1"
-version_info = (3, 3, 0, -100)
+version = "4.0.dev1"
+version_info = (4, 0, 0, -100)

tornado/auth.py

@@ -51,7 +51,7 @@ def get(self):
                     response_type='code',
                     extra_params={'approval_prompt': 'auto'})
 
-.. versionchanged:: 3.3
+.. versionchanged:: 4.0
    All of the callback interfaces in this module are now guaranteed
    to run their callback with an argument of ``None`` on error.
    Previously some functions would do this while others would simply

tornado/concurrent.py

@@ -60,7 +60,7 @@ class Future(object):
     This functionality was previously available in a separate class
     ``TracebackFuture``, which is now a deprecated alias for this class.
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
        `tornado.concurrent.Future` is always a thread-unsafe ``Future``
        with support for the ``exc_info`` methods.  Previously it would
        be an alias for the thread-safe `concurrent.futures.Future`
@@ -152,7 +152,7 @@ def set_exception(self, exception):
     def exc_info(self):
         """Returns a tuple in the same format as `sys.exc_info` or None.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         return self._exc_info
 
@@ -161,7 +161,7 @@ def set_exc_info(self, exc_info):
 
         Preserves tracebacks on Python 2.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         self._exc_info = exc_info
         self.set_exception(exc_info[1])

tornado/gen.py

@@ -355,7 +355,7 @@ def Task(func, *args, **kwargs):
         func(args, callback=(yield gen.Callback(key)))
         result = yield gen.Wait(key)
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
        ``gen.Task`` is now a function that returns a `.Future`, instead of
        a subclass of `YieldPoint`.  It still behaves the same way when
        yielded.
@@ -464,7 +464,7 @@ def multi_future(children):
     This function is faster than the `Multi` `YieldPoint` because it does not
     require the creation of a stack context.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     if isinstance(children, dict):
         keys = list(children.keys())
@@ -520,7 +520,7 @@ def with_timeout(timeout, future, io_loop=None):
 
     Currently only supports Futures, not other `YieldPoint` classes.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     # TODO: allow yield points in addition to futures?
     # Tricky to do with stack_context semantics.
@@ -564,7 +564,7 @@ def with_timeout(timeout, future, io_loop=None):
 
 Usage: ``yield gen.moment``
 
-.. versionadded:: 3.3
+.. versionadded:: 4.0
 """
 moment.set_result(None)
 

tornado/http1connection.py

@@ -16,7 +16,7 @@
 
 """Client and server implementations of HTTP/1.x.
 
-.. versionadded:: 3.3
+.. versionadded:: 4.0
 """
 
 from __future__ import absolute_import, division, print_function, with_statement
@@ -258,7 +258,7 @@ def _clear_callbacks(self):
     def set_close_callback(self, callback):
         """Sets a callback that will be run when the connection is closed.
 
-        .. deprecated:: 3.3
+        .. deprecated:: 4.0
             Use `.HTTPMessageDelegate.on_connection_close` instead.
         """
         self._close_callback = stack_context.wrap(callback)

tornado/httpclient.py

@@ -284,7 +284,7 @@ def __init__(self, url, method="GET", headers=None, body=None,
            ``curl_httpclient``.  When using ``body_producer`` it is recommended
            to pass a ``Content-Length`` in the headers as otherwise chunked
            encoding will be used, and many servers do not support chunked
-           encoding on requests.  New in Tornado 3.3
+           encoding on requests.  New in Tornado 4.0
         :arg string auth_username: Username for HTTP authentication
         :arg string auth_password: Password for HTTP authentication
         :arg string auth_mode: Authentication mode; default is "basic".
@@ -358,7 +358,7 @@ def __init__(self, url, method="GET", headers=None, body=None,
         .. versionadded:: 3.1
            The ``auth_mode`` argument.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
            The ``body_producer`` and ``expect_100_continue`` arguments.
         """
         # Note that some of these attributes go through property setters

tornado/httpserver.py

@@ -20,7 +20,7 @@
 class except to start a server at the beginning of the process
 (and even that is often done indirectly via `tornado.web.Application.listen`).
 
-.. versionchanged:: 3.3
+.. versionchanged:: 4.0
 
    The ``HTTPRequest`` class that used to live in this module has been moved
    to `tornado.httputil.HTTPServerRequest`.  The old name remains as an alias.
@@ -128,7 +128,7 @@ def handle_request(request):
        servers if you want to create your listening sockets in some
        way other than `tornado.netutil.bind_sockets`.
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
        Added ``gzip``, ``chunk_size``, ``max_header_size``,
        ``idle_connection_timeout``, ``body_timeout``, ``max_body_size``
        arguments.  Added support for `.HTTPServerConnectionDelegate`

tornado/httputil.py

@@ -319,7 +319,7 @@ class HTTPServerRequest(object):
        are typically kept open in HTTP/1.1, multiple requests can be handled
        sequentially on a single connection.
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
        Moved from ``tornado.httpserver.HTTPRequest``.
     """
     def __init__(self, method=None, uri=None, version="HTTP/1.0", headers=None,
@@ -352,7 +352,7 @@ def __init__(self, method=None, uri=None, version="HTTP/1.0", headers=None,
     def supports_http_1_1(self):
         """Returns True if this request supports HTTP/1.1 semantics.
 
-        .. deprecated:: 3.3
+        .. deprecated:: 4.0
            Applications are less likely to need this information with the
            introduction of `.HTTPConnection`.  If you still need it, access
            the ``version`` attribute directly.
@@ -375,7 +375,7 @@ def cookies(self):
     def write(self, chunk, callback=None):
         """Writes the given chunk to the response stream.
 
-        .. deprecated:: 3.3
+        .. deprecated:: 4.0
            Use ``request.connection`` and the `.HTTPConnection` methods
            to write the response.
         """
@@ -385,7 +385,7 @@ def write(self, chunk, callback=None):
     def finish(self):
         """Finishes this HTTP request on the open connection.
 
-        .. deprecated:: 3.3
+        .. deprecated:: 4.0
            Use ``request.connection`` and the `.HTTPConnection` methods
            to write the response.
         """
@@ -449,23 +449,23 @@ class HTTPInputException(Exception):
     """Exception class for malformed HTTP requests or responses
     from remote sources.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     pass
 
 
 class HTTPOutputException(Exception):
     """Exception class for errors in HTTP output.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     pass
 
 
 class HTTPServerConnectionDelegate(object):
     """Implement this interface to handle requests from `.HTTPServer`.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     def start_request(self, server_conn, request_conn):
         """This method is called by the server when a new request has started.
@@ -491,7 +491,7 @@ def on_close(self, server_conn):
 class HTTPMessageDelegate(object):
     """Implement this interface to handle an HTTP request or response.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     def headers_received(self, start_line, headers):
         """Called when the HTTP headers have been received and parsed.
@@ -531,7 +531,7 @@ def on_connection_close(self):
 class HTTPConnection(object):
     """Applications use this interface to write their responses.
 
-    .. versionadded:: 3.3
+    .. versionadded:: 4.0
     """
     def write_headers(self, start_line, headers, chunk=None, callback=None):
         """Write an HTTP header block.

tornado/ioloop.py

@@ -162,7 +162,7 @@ def install(self):
     def clear_instance():
         """Clear the global `IOLoop` instance.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         if hasattr(IOLoop, "_instance"):
             del IOLoop._instance
@@ -267,7 +267,7 @@ def add_handler(self, fd, handler, events):
 
         When an event occurs, ``handler(fd, events)`` will be run.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            Added the ability to pass file-like objects in addition to
            raw file descriptors.
         """
@@ -276,7 +276,7 @@ def add_handler(self, fd, handler, events):
     def update_handler(self, fd, events):
         """Changes the events we listen for ``fd``.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            Added the ability to pass file-like objects in addition to
            raw file descriptors.
         """
@@ -285,7 +285,7 @@ def update_handler(self, fd, events):
     def remove_handler(self, fd):
         """Stop listening for events on ``fd``.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            Added the ability to pass file-like objects in addition to
            raw file descriptors.
         """
@@ -534,7 +534,7 @@ def split_fd(self, fd):
         This method is provided for use by `IOLoop` subclasses and should
         not generally be used by application code.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         try:
             return fd.fileno(), fd
@@ -551,7 +551,7 @@ def close_fd(self, fd):
         implementations of ``IOLoop.close(all_fds=True)`` and should
         not generally be used by application code.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         try:
             try:

tornado/iostream.py

@@ -116,7 +116,7 @@ def __init__(self, io_loop=None, max_buffer_size=None,
         :arg max_write_buffer_size: Amount of outgoing data to buffer;
             defaults to unlimited.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            Add the ``max_write_buffer_size`` parameter.  Changed default
            ``read_chunk_size`` to 64KB.
         """
@@ -203,7 +203,7 @@ def read_until_regex(self, regex, callback=None, max_bytes=None):
         if more than ``max_bytes`` bytes have been read and the regex is
         not satisfied.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             Added the ``max_bytes`` argument.  The ``callback`` argument is
             now optional and a `.Future` will be returned if it is omitted.
         """
@@ -230,7 +230,7 @@ def read_until(self, delimiter, callback=None, max_bytes=None):
         if more than ``max_bytes`` bytes have been read and the delimiter
         is not found.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             Added the ``max_bytes`` argument.  The ``callback`` argument is
             now optional and a `.Future` will be returned if it is omitted.
         """
@@ -259,7 +259,7 @@ def read_bytes(self, num_bytes, callback=None, streaming_callback=None,
         If ``partial`` is true, the callback is run as soon as we have
         any bytes to return (but never more than ``num_bytes``)
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             Added the ``partial`` argument.  The callback argument is now
             optional and a `.Future` will be returned if it is omitted.
         """
@@ -280,7 +280,7 @@ def read_until_close(self, callback=None, streaming_callback=None):
         If a callback is given, it will be run with the data as an argument;
         if not, this method returns a `.Future`.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             The callback argument is now optional and a `.Future` will
             be returned if it is omitted.
         """
@@ -308,7 +308,7 @@ def write(self, data, callback=None):
         completed.  If `write` is called again before that `.Future` has
         resolved, the previous future will be orphaned and will never resolve.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             Now returns a `.Future` if no callback is given.
         """
         assert isinstance(data, bytes_type)
@@ -966,7 +966,7 @@ def connect(self, address, callback=None, server_hostname=None):
         is ready.  Calling `IOStream` read methods before the socket is
         connected works on some platforms but is non-portable.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
             If no callback is given, returns a `.Future`.
         """
         self._connecting = True
@@ -1021,7 +1021,7 @@ def start_tls(self, server_side, ssl_options=None, server_hostname=None):
         If a close callback is defined on this stream, it will be
         transferred to the new stream.
 
-        .. versionadded:: 3.3
+        .. versionadded:: 4.0
         """
         if (self._read_callback or self._read_future or
                 self._write_callback or self._write_future or

tornado/testing.py

@@ -459,7 +459,7 @@ def test_something_slow(self):
        The ``timeout`` argument and ``ASYNC_TEST_TIMEOUT`` environment
        variable.
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
        The wrapper now passes along ``*args, **kwargs`` so it can be used
        on functions with arguments.
     """

tornado/web.py

@@ -820,7 +820,7 @@ def flush(self, include_footers=False, callback=None):
         if another flush occurs before the previous flush's callback
         has been run, the previous callback will be discarded.
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            Now returns a `.Future` if no callback is given.
         """
         chunk = b"".join(self._write_buffer)
@@ -2367,7 +2367,7 @@ def get_content_size(self):
 
         .. versionadded:: 3.1
 
-        .. versionchanged:: 3.3
+        .. versionchanged:: 4.0
            This method is now always called, instead of only when
            partial results are requested.
         """
@@ -2533,7 +2533,7 @@ class GZipContentEncoding(OutputTransform):
 
     See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
 
-    .. versionchanged:: 3.3
+    .. versionchanged:: 4.0
         Now compresses all mime types beginning with ``text/``, instead
         of just a whitelist. (the whitelist is still used for certain
         non-text mime types).