diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | cherrypy/__init__.py | 2 | ||||
| -rw-r--r-- | cherrypy/lib/reprconf.py | 3 | ||||
| -rw-r--r-- | cherrypy/process/plugins.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 2 | ||||
| -rw-r--r-- | release.py | 22 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
9 files changed, 19 insertions, 19 deletions
@@ -36,3 +36,4 @@ ee66c594632b75b458065ef0256af5ffc7eb307c cherrypy-3.2.2rc1 81c92cbcf2302f83efa739970a35ec48733b177c cherrypy-3.2.2 c9d13db2b4331474b768b3ed156ddae5030e7f2c 3.2.3 cd8acbc5f2b3914d396f2925b2d5e2561cfd39a4 3.2.4 +052f32b1d56309115c8f4fe48f4bf25a15b87706 3.2.5 diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index dc986569..d86a458c 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.2.4" +__version__ = "3.2.5" from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode from cherrypy._cpcompat import basestring, unicodestr, set diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py index 32f4dda0..67ed9f3c 100644 --- a/cherrypy/lib/reprconf.py +++ b/cherrypy/lib/reprconf.py @@ -419,6 +419,9 @@ class _Builder3: raise TypeError("unrepr could not resolve the name %s" % repr(name)) + def build_NameConstant(self, o): + return o.value + def build_UnaryOp(self, o): op, operand = map(self.build, [o.op, o.operand]) return op(operand) diff --git a/cherrypy/process/plugins.py b/cherrypy/process/plugins.py index 4d7dcbfd..c787ba92 100644 --- a/cherrypy/process/plugins.py +++ b/cherrypy/process/plugins.py @@ -610,7 +610,7 @@ class Autoreloader(Monitor): def sysfiles(self): """Return a Set of sys.modules filenames to monitor.""" files = set() - for k, m in sys.modules.items(): + for k, m in list(sys.modules.items()): if re.match(self.match, k): if ( hasattr(m, '__loader__') and diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index 46b41fb1..9ca13e6c 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.2.4" + version = "CherryPy/3.2.5" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 156b716c..038e11f3 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.2.4" + version = "CherryPy/3.2.5" """A version string for the HTTPServer.""" software = None @@ -15,7 +15,7 @@ import platform import shutil import importlib -VERSION = '3.2.4' +VERSION = '3.2.5' if sys.version_info < (3,): input = raw_input @@ -75,7 +75,9 @@ def bump_versions(): def bump_version(filename): with open(filename, 'rb') as f: - lines = [line.replace(VERSION, NEXT_VERSION) for line in f] + b_version = VERSION.encode('ascii') + b_next_version = NEXT_VERSION.encode('ascii') + lines = [line.replace(b_version, b_next_version) for line in f] with open(filename, 'wb') as f: f.writelines(lines) @@ -86,12 +88,7 @@ def tag_release(): """ subprocess.check_call(['hg', 'tag', NEXT_VERSION]) -dist_commands = [ - [sys.executable, 'setup.py', 'sdist', '--format=zip'], - [sys.executable, 'setup.py', 'sdist', '--format=gztar'], - [sys.executable, 'setup.py', 'bdist_wininst'], - [sys.executable, 'setup.py', 'bdist_wheel'], -] +dist_commands = ['sdist', 'bdist_wininst', 'bdist_wheel'] def build(): @@ -99,12 +96,12 @@ def build(): os.remove('MANIFEST') if os.path.isdir('dist'): shutil.rmtree('dist') - list(map(subprocess.check_call, dist_commands)) + subprocess.check_call([sys.executable, 'setup.py'] + dist_commands) def push(): "The build went well, so let's push the SCM changesets" - subprocess.check_call(['hg', 'push']) + subprocess.check_call(['hg', 'push', '-r', '.']) def publish(): @@ -112,9 +109,8 @@ def publish(): Publish the dists on PyPI """ try: - upload_dist_commands = [cmd + ['register', 'upload'] - for cmd in dist_commands] - list(map(subprocess.check_call, upload_dist_commands)) + upload_dist_command = [sys.executable, 'setup.py'] + dist_commands + ['register', 'upload'] + subprocess.check_call(upload_dist_command) except: print("Unable to upload the dist files. Ask in IRC for help access 57" "or assistance.") @@ -1,5 +1,5 @@ [sdist] -formats=gztar +formats=gztar,zip [nosetests] where=cherrypy @@ -36,7 +36,7 @@ class cherrypy_build_py(build_py): # arguments for the setup command ############################################################################### name = "CherryPy" -version = "3.2.4" +version = "3.2.5" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers = [ |