summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-06-27 16:40:08 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-06-27 16:40:08 -0400
commita025694e11b1377df89975bdd6197dfe2a63ca48 (patch)
tree0a074c29812ec6401316780440cf39c2144984f1
parent81b5edf484b21dde7e1ad5aa19b6738f4b0f3b3e (diff)
downloadcherrypy-a025694e11b1377df89975bdd6197dfe2a63ca48.tar.gz
Bumped to 3.4.0 in preparation for next release.3.4.0
-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 469b8cba..d3fb3e04 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.3.0"
+__version__ = "3.4.0"
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 a304922a..a8ba3535 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.3.0"
+ version = "CherryPy/3.4.0"
"""A version string for the HTTPServer."""
software = None
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py
index 88acff9a..c7a68ea3 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.3.0"
+ version = "CherryPy/3.4.0"
"""A version string for the HTTPServer."""
software = None
diff --git a/setup.py b/setup.py
index 0e8ed818..80046028 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.3.0"
+version = "3.4.0"
desc = "Object-Oriented HTTP framework"
long_desc = "CherryPy is a pythonic, object-oriented HTTP framework"
classifiers = [