summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-06-27 16:40:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-06-27 16:40:40 -0400
commit021bfd06914fdc19e5eb5fc8fbaac0ae44aad2ed (patch)
tree71cd30cbf2bd8166330b2f0708442ff8cf87f983
parentd949369fa60c4d2262e3f42bd13823369b5c90e3 (diff)
downloadcherrypy-021bfd06914fdc19e5eb5fc8fbaac0ae44aad2ed.tar.gz
Bumped to 3.4.1 in preparation for next release.
-rw-r--r--cherrypy/__init__.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver2.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver3.py2
-rw-r--r--setup.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py
index d3fb3e04..34fe8132 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.4.0"
+__version__ = "3.4.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 a8ba3535..8846d6e4 100644
--- a/cherrypy/wsgiserver/wsgiserver2.py
+++ b/cherrypy/wsgiserver/wsgiserver2.py
@@ -1755,7 +1755,7 @@ class HTTPServer(object):
timeout = 10
"""The timeout in seconds for accepted connections (default 10)."""
- version = "CherryPy/3.4.0"
+ version = "CherryPy/3.4.1"
"""A version string for the HTTPServer."""
software = None
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py
index c7a68ea3..5e3681c9 100644
--- a/cherrypy/wsgiserver/wsgiserver3.py
+++ b/cherrypy/wsgiserver/wsgiserver3.py
@@ -1466,7 +1466,7 @@ class HTTPServer(object):
timeout = 10
"""The timeout in seconds for accepted connections (default 10)."""
- version = "CherryPy/3.4.0"
+ version = "CherryPy/3.4.1"
"""A version string for the HTTPServer."""
software = None
diff --git a/setup.py b/setup.py
index 80046028..52a66bdf 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ class cherrypy_build_py(build_py):
# arguments for the setup command
###############################################################################
name = "CherryPy"
-version = "3.4.0"
+version = "3.4.1"
desc = "Object-Oriented HTTP framework"
long_desc = "CherryPy is a pythonic, object-oriented HTTP framework"
classifiers = [