diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-02-23 12:12:44 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-02-23 12:12:44 -0500 |
commit | b9da1c453efc95f1dd3ad71d6cec709764619cc9 (patch) | |
tree | 1a08cbdf154ea6642b384c1039a1a911f2fee375 | |
parent | e48b7157556830b7489b06edf9c36cce4cb38168 (diff) | |
download | cherrypy-git-3.2.5.tar.gz |
Bumped to 3.2.5 in preparation for next release.3.2.5
--HG--
branch : cherrypy-3.2.x
-rw-r--r-- | cherrypy/__init__.py | 2 | ||||
-rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 2 | ||||
-rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 2 | ||||
-rw-r--r-- | release.py | 2 | ||||
-rw-r--r-- | setup.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index 95230c71..29621193 100644 --- a/cherrypy/__init__.py +++ b/cherrypy/__init__.py @@ -57,7 +57,7 @@ These API's are described in the CherryPy specification: http://www.cherrypy.org/wiki/CherryPySpec """ -__version__ = "3.2.4" +__version__ = "3.2.5" from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode from cherrypy._cpcompat import basestring, unicodestr, set diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index cd1ac2f9..4192c2dc 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1659,7 +1659,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.4" + version = "CherryPy/3.2.5" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index a47f8d5f..0467c10d 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -1384,7 +1384,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.4" + version = "CherryPy/3.2.5" """A version string for the HTTPServer.""" software = None @@ -15,7 +15,7 @@ import platform import shutil import importlib -VERSION='3.2.4' +VERSION='3.2.5' if sys.version_info < (3,): input = raw_input @@ -34,7 +34,7 @@ class cherrypy_build_py(build_py): # arguments for the setup command ############################################################################### name = "CherryPy" -version = "3.2.4" +version = "3.2.5" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers=[ |