From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 14 Jan 2012 07:07:37 +0000 (-0800)
Subject: Add a fourth release status field to tornado.version_info.
X-Git-Tag: v2.2.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4457f2b9f8a165d9220c060e79a6299db6b7b15b;p=thirdparty%2Ftornado.git

Add a fourth release status field to tornado.version_info.

Closes #432.
---

diff --git a/tornado/__init__.py b/tornado/__init__.py
index ea48b0f02..d95c016cc 100644
--- 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 c587ad1ff..ceefc741c 100644
--- 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.