diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-14 00:06:44 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-14 00:06:44 -0400 |
| commit | bcc1b049229f7efc7f154c28d3eea5cd8f0b37ff (patch) | |
| tree | 921f83b7febb6b8f74a85e6ae5e4ea4f6cfe653a | |
| parent | ee47d296e1732838045822f3e5d6d840e4112968 (diff) | |
| download | cherrypy-bcc1b049229f7efc7f154c28d3eea5cd8f0b37ff.tar.gz | |
Bumped to 3.6.1 in preparation for next release.
| -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-- | setup.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index 7870ef0d..d90ffc7c 100644 --- a/cherrypy/__init__.py +++ b/cherrypy/__init__.py @@ -56,7 +56,7 @@ with customized or extended components. The core API's are: These API's are described in the `CherryPy specification <https://bitbucket.org/cherrypy/cherrypy/wiki/CherryPySpec>`_. """ -__version__ = "3.6.0" +__version__ = "3.6.1" 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 c7f08350..c197748e 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1757,7 +1757,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.6.0" + version = "CherryPy/3.6.1" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 8bba6261..24e38ad3 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -1468,7 +1468,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.6.0" + version = "CherryPy/3.6.1" """A version string for the HTTPServer.""" software = None @@ -36,7 +36,7 @@ class cherrypy_build_py(build_py): # arguments for the setup command ############################################################################### name = "CherryPy" -version = "3.6.0" +version = "3.6.1" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers = [ |