Add a fourth release status field to tornado.version_info.

Closes #432.

diff --git a/tornado/__init__.py b/tornado/__init__.py
index ea48b0f02a5a072ced7d25e8997d6c7ea86ec35b..d95c016cc28f47a8d75c4d3e591481c2bf2674a5 100644 (file)
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,12 @@
 
 """The Tornado web server and tools."""
 
+# version is a human-readable version number.
+
+# version_info is a four-tuple for programmatic comparison. The first
+# three numbers are the components of the version number.  The fourth
+# is zero for an official release, positive for a development branch,
+# or negative for a release candidate (after the base version number
+# has been incremented)
 version = "2.1.1git"
-version_info = (2, 1, 1)
+version_info = (2, 1, 1, 1)

diff --git a/website/sphinx/releases/next.rst b/website/sphinx/releases/next.rst
index c587ad1ffc3d080d75cb8e1951894a8578dce56b..ceefc741c9a5603511a333cffe996752a8bd7515 100644 (file)
--- a/website/sphinx/releases/next.rst
+++ b/website/sphinx/releases/next.rst
@@ -83,3 +83,5 @@ Other modules
   to catch exceptions thrown by a ``Task``.
 * `tornado.netutil.bind_sockets` now works when ``getaddrinfo`` returns
   duplicate addresses.
+* `tornado.version_info` is now a four-tuple so official releases can be
+  distinguished from development branches.