You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2015/07/23 23:45:10 UTC
svn commit: r1692449 - in /subversion/trunk: build/generator/gen_win.py
build/transform_sql.py
subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
subversion/bindings/swig/python/svn/core.py tools/dev/scramble-tree.py
tools/dist/release.py
Author: danielsh
Date: Thu Jul 23 21:45:09 2015
New Revision: 1692449
URL: http://svn.apache.org/r1692449
Log:
Require Python ≥2.7 for Subversion 1.9, part 2: coding simplifications.
* build/generator/gen_win.py (hashlib_md5),
* build/transform_sql.py (operator.methodcaller),
* subversion/bindings/swig/python/svn/core.py (SubversionException.message),
* tools/dev/scramble-tree.py (hashlib_md5)
* tools/dist/release.py (__future__.with_statement):
Remove conditional code for now-unsupported Python versions.
* subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
Note a possible code simplification.
Modified:
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/transform_sql.py
subversion/trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
subversion/trunk/subversion/bindings/swig/python/svn/core.py
subversion/trunk/tools/dev/scramble-tree.py
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Thu Jul 23 21:45:09 2015
@@ -23,12 +23,7 @@
#
import os
-try:
- # Python >=2.5
- from hashlib import md5 as hashlib_md5
-except ImportError:
- # Python <2.5
- from md5 import md5 as hashlib_md5
+from hashlib import md5 as hashlib_md5
import sys
import fnmatch
import re
Modified: subversion/trunk/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/transform_sql.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/build/transform_sql.py (original)
+++ subversion/trunk/build/transform_sql.py Thu Jul 23 21:45:09 2015
@@ -31,13 +31,6 @@ import re
import sys
-# operator.methodcaller doesn't exist in Python 2.5.
-if not hasattr(operator, 'methodcaller'):
- def methodcaller(method, *args, **kwargs):
- return lambda x: getattr(x, method)(*args, **kwargs)
- operator.methodcaller = methodcaller
- del methodcaller
-
DEFINE_END = ' ""\n\n'
Modified: subversion/trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py (original)
+++ subversion/trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py Thu Jul 23 21:45:09 2015
@@ -138,6 +138,7 @@ class _CallbackResultIterator(object):
finally:
self.receiver.lock.release()
+ # ### TODO: simplify, removing support for Python 2.4
# Return the first result. Only Python 2.5 supports 'yield'
# inside a try-finally block, so we jump through some hoops here
# to avoid that case.
Modified: subversion/trunk/subversion/bindings/swig/python/svn/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/core.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/core.py Thu Jul 23 21:45:09 2015
@@ -32,14 +32,6 @@ import sys
class SubversionException(Exception):
- # Python 2.6 deprecated BaseException.message, which we inadvertently use.
- # We override it here, so the users of this class are spared from
- # DeprecationWarnings.
- # Note that BaseException.message is not deprecated in Python 2.5, and
- # isn't present in all other versions.
- if sys.version_info[0:2] == (2, 6):
- message = None
-
def __init__(self, message=None, apr_err=None, child=None,
file=None, line=None):
"""Initialize a new Subversion exception object.
Modified: subversion/trunk/tools/dev/scramble-tree.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/scramble-tree.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/tools/dev/scramble-tree.py (original)
+++ subversion/trunk/tools/dev/scramble-tree.py Thu Jul 23 21:45:09 2015
@@ -60,12 +60,7 @@ try:
except AttributeError:
my_getopt = getopt.getopt
import random
-try:
- # Python >=2.5
- from hashlib import md5 as hashlib_md5
-except ImportError:
- # Python <2.5
- from md5 import md5 as hashlib_md5
+from hashlib import md5 as hashlib_md5
import base64
Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1692449&r1=1692448&r2=1692449&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu Jul 23 21:45:09 2015
@@ -34,9 +34,6 @@
# It'd be kind of nice to use the Subversion python bindings in this script,
# but people.apache.org doesn't currently have them installed
-# Futures (Python 2.5 compatibility)
-from __future__ import with_statement
-
# Stuff we need
import os
import re