summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-03-27 22:20:06 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-03-27 22:20:06 -0400
commitf5c94d7de50e42fe407f189f5afd7a39e40419ce (patch)
treedaf88ea217891bbe9ab06c615e01bd32594f05d2
parent22284f4e06804ecb66e6bcd0afe825cbab542797 (diff)
downloadcherrypy-f5c94d7de50e42fe407f189f5afd7a39e40419ce.tar.gz
Bumped to 3.2.4 in preparation for next release.3.2.4
-rw-r--r--cherrypy/__init__.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver2.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver3.py2
-rw-r--r--release.py2
-rw-r--r--setup.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py
index aeed1264..95230c71 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.3"
+__version__ = "3.2.4"
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 6a01a0d3..cd1ac2f9 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.3"
+ version = "CherryPy/3.2.4"
"""A version string for the HTTPServer."""
software = None
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py
index 76a7ca50..a47f8d5f 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.3"
+ version = "CherryPy/3.2.4"
"""A version string for the HTTPServer."""
software = None
diff --git a/release.py b/release.py
index f558fc3e..b0944f52 100644
--- a/release.py
+++ b/release.py
@@ -14,7 +14,7 @@ import os
import platform
import shutil
-VERSION='3.2.3'
+VERSION='3.2.4'
if sys.version_info < (3,):
input = raw_input
diff --git a/setup.py b/setup.py
index a0b65a97..39b76add 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ class cherrypy_build_py(build_py):
# arguments for the setup command
###############################################################################
name = "CherryPy"
-version = "3.2.3"
+version = "3.2.4"
desc = "Object-Oriented HTTP framework"
long_desc = "CherryPy is a pythonic, object-oriented HTTP framework"
classifiers=[