Commits

Jason R. Coombs  committed d7c9e75 Merge

Merge with 3.2.x

  • Participants
  • Parent commits 080abbb, 52f5daa

Comments (0)

Files changed (10)

 c9d13db2b4331474b768b3ed156ddae5030e7f2c 3.2.3
 cd8acbc5f2b3914d396f2925b2d5e2561cfd39a4 3.2.4
 052f32b1d56309115c8f4fe48f4bf25a15b87706 3.2.5
+3dab916fa0f7fdc59b374e8d31624de59c086f33 3.2.6

File cherrypy/__init__.py

 These API's are described in the `CherryPy specification <https://bitbucket.org/cherrypy/cherrypy/wiki/CherryPySpec>`_.
 """
 
-__version__ = "3.2.5"
+__version__ = "3.2.6"
 
 from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode
 from cherrypy._cpcompat import basestring, unicodestr, set

File cherrypy/lib/cptools.py

File contents unchanged.

File cherrypy/lib/jsontools.py

-import sys
 import cherrypy
-from cherrypy._cpcompat import basestring, ntou, json, json_encode, json_decode
+from cherrypy._cpcompat import basestring, ntou, json_encode, json_decode
 
 
 def json_processor(entity):

File cherrypy/test/test_proxy.py

File contents unchanged.

File cherrypy/wsgiserver/ssl_pyopenssl.py

File contents unchanged.

File cherrypy/wsgiserver/wsgiserver2.py

     timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
 
-    version = "CherryPy/3.2.5"
+    version = "CherryPy/3.2.6"
     """A version string for the HTTPServer."""
 
     software = None

File cherrypy/wsgiserver/wsgiserver3.py

     timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
 
-    version = "CherryPy/3.2.5"
+    version = "CherryPy/3.2.6"
     """A version string for the HTTPServer."""
 
     software = None
 import shutil
 import importlib
 
-VERSION = '3.2.5'
+from six.moves import input
 
-if sys.version_info < (3,):
-    input = raw_input
+VERSION='3.2.6'
 
 
 def get_next_version():
 
 NEXT_VERSION = get_next_version()
 
-files_with_versions = ('release.py', 'setup.py', 'cherrypy/__init__.py',
+files_with_versions = (
+    'release.py', 'setup.py', 'cherrypy/__init__.py',
                        'cherrypy/wsgiserver/wsgiserver2.py',
                        'cherrypy/wsgiserver/wsgiserver3.py',
                        )

File setup.py

File contents unchanged.