You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/04/30 10:16:55 UTC
svn commit: r1741723 - in /subversion/trunk: contrib/client-side/
contrib/client-side/svnmerge/ contrib/server-side/
contrib/server-side/fsfsfixer/fixer/ subversion/bindings/swig/python/tests/
subversion/tests/cmdline/ subversion/tests/cmdline/svntest/...
Author: stefan2
Date: Sat Apr 30 08:16:53 2016
New Revision: 1741723
URL: http://svn.apache.org/viewvc?rev=1741723&view=rev
Log:
Work towards Python 3 compatibility. Since we already require Python 2.7+,
we can use the new syntax without further limiting our Python 2 support.
* contrib/client-side/incremental-update.py
* contrib/client-side/svn_apply_autoprops.py
* contrib/client-side/svnmerge/svnmerge-migrate-history.py
* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
* contrib/client-side/svnmerge/svnmerge.py
* contrib/client-side/svnmerge/svnmerge_test.py
* contrib/server-side/add-needs-lock.py
* contrib/server-side/fsfsfixer/fixer/fix-rev.py
* contrib/server-side/fsfsverify.py
* contrib/server-side/svn-tweak-author.py
* subversion/bindings/swig/python/tests/core.py
* subversion/bindings/swig/python/tests/repository.py
* subversion/tests/cmdline/svntest/actions.py
* subversion/tests/cmdline/svntest/main.py
* subversion/tests/cmdline/svntest/objects.py
* subversion/tests/cmdline/svntest/wc.py
* subversion/tests/cmdline/upgrade_tests.py
* tools/client-side/change-svn-wc-format.py
* tools/client-side/mergeinfo-sanitizer.py
* tools/dev/contribulyze.py
* tools/dev/gen-javahl-errors.py
* tools/dev/gen_junit_report.py
* tools/dev/graph-dav-servers.py
* tools/dev/iz/ff2csv.py
* tools/dev/iz/find-fix.py
* tools/dev/wc-ng/bump-to-19.py
* tools/dev/wc-ng/populate-pristine.py
* tools/dev/which-error.py
* tools/examples/get-location-segments.py
* tools/hook-scripts/svn2feed.py
* tools/hook-scripts/svnperms.py
* tools/po/l10n-report.py
* tools/server-side/fsfs-reshard.py
* tools/server-side/svn-backup-dumps.py
* tools/server-side/svnpredumpfilter.py
* tools/server-side/svnpubsub/daemonize.py
* tools/server-side/test_svn_server_log_parse.py
(): Replace all occurances of "except Type, variable:" with Python 3
style "except Type as variable".
Modified:
subversion/trunk/contrib/client-side/incremental-update.py
subversion/trunk/contrib/client-side/svn_apply_autoprops.py
subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
subversion/trunk/contrib/client-side/svnmerge/svnmerge.py
subversion/trunk/contrib/client-side/svnmerge/svnmerge_test.py
subversion/trunk/contrib/server-side/add-needs-lock.py
subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
subversion/trunk/contrib/server-side/fsfsverify.py
subversion/trunk/contrib/server-side/svn-tweak-author.py
subversion/trunk/subversion/bindings/swig/python/tests/core.py
subversion/trunk/subversion/bindings/swig/python/tests/repository.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/subversion/tests/cmdline/svntest/objects.py
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
subversion/trunk/tools/client-side/change-svn-wc-format.py
subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
subversion/trunk/tools/dev/contribulyze.py
subversion/trunk/tools/dev/gen-javahl-errors.py
subversion/trunk/tools/dev/gen_junit_report.py
subversion/trunk/tools/dev/graph-dav-servers.py
subversion/trunk/tools/dev/iz/ff2csv.py
subversion/trunk/tools/dev/iz/find-fix.py
subversion/trunk/tools/dev/wc-ng/bump-to-19.py
subversion/trunk/tools/dev/wc-ng/populate-pristine.py
subversion/trunk/tools/dev/which-error.py
subversion/trunk/tools/examples/get-location-segments.py
subversion/trunk/tools/hook-scripts/svn2feed.py
subversion/trunk/tools/hook-scripts/svnperms.py
subversion/trunk/tools/po/l10n-report.py
subversion/trunk/tools/server-side/fsfs-reshard.py
subversion/trunk/tools/server-side/svn-backup-dumps.py
subversion/trunk/tools/server-side/svnpredumpfilter.py
subversion/trunk/tools/server-side/svnpubsub/daemonize.py
subversion/trunk/tools/server-side/test_svn_server_log_parse.py
Modified: subversion/trunk/contrib/client-side/incremental-update.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/incremental-update.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/incremental-update.py (original)
+++ subversion/trunk/contrib/client-side/incremental-update.py Sat Apr 30 08:16:53 2016
@@ -183,6 +183,6 @@ if __name__ == "__main__":
main()
except SystemExit:
raise
- except Exception, e:
+ except Exception as e:
print_error(str(e))
sys.exit(1)
Modified: subversion/trunk/contrib/client-side/svn_apply_autoprops.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_apply_autoprops.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn_apply_autoprops.py (original)
+++ subversion/trunk/contrib/client-side/svn_apply_autoprops.py Sat Apr 30 08:16:53 2016
@@ -152,7 +152,7 @@ def filter_walk(autoprop_lines, dirname,
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'config='])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
usage()
return 1
Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py Sat Apr 30 08:16:53 2016
@@ -366,7 +366,7 @@ class SvnmergeHistoryMigrator:
sys.stdout.write(" new sanitized chunk:\n")
pretty_print_mergeinfo(history, 6)
new_mergeinfo = mergeinfo_merge(new_mergeinfo, history)
- except core.SubversionException, e:
+ except core.SubversionException as e:
if not (e.apr_err == core.SVN_ERR_FS_NOT_FOUND
or e.apr_err == core.SVN_ERR_FS_NO_SUCH_REVISION):
raise
Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py Sat Apr 30 08:16:53 2016
@@ -39,7 +39,7 @@ try:
import svn.core
import svn.fs
import svn.repos
-except ImportError, e:
+except ImportError as e:
print >> sys.stderr, \
"ERROR: Unable to import Subversion's Python bindings: '%s'\n" \
"Hint: Set your PYTHONPATH environment variable, or adjust your " \
@@ -230,7 +230,7 @@ class Migrator:
filtered_mergeinfo = \
svn.core.svn_mergeinfo_merge(filtered_mergeinfo,
source_history)
- except svn.core.SubversionException, e:
+ except svn.core.SubversionException as e:
if not (e.apr_err == svn.core.SVN_ERR_FS_NOT_FOUND
or e.apr_err == svn.core.SVN_ERR_FS_NO_SUCH_REVISION):
raise
Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge.py Sat Apr 30 08:16:53 2016
@@ -263,7 +263,7 @@ try:
stdoutAndErr = p.communicate()
stdout = stdoutAndErr[0]
stderr = stdoutAndErr[1]
- except OSError, inst:
+ except OSError as inst:
# Using 1 as failure code; should get actual number somehow? For
# examples see svnmerge_test.py's TestCase_launch.test_failure and
# TestCase_launch.test_failurecode.
@@ -1960,7 +1960,7 @@ class CommandOpts:
opts.extend(cmd.opts)
args.remove(cmd.name)
state, args = self._fancy_getopt(args, opts)
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
self.error(e, cmd)
# Handle builtins
@@ -2367,7 +2367,7 @@ def main(args):
if __name__ == "__main__":
try:
main(sys.argv[1:])
- except LaunchError, (ret, cmd, out):
+ except LaunchError as (ret, cmd, out):
err_msg = "command execution failed (exit code: %d)\n" % ret
err_msg += cmd + "\n"
err_msg += "".join(out)
Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge_test.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge_test.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge_test.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge_test.py Sat Apr 30 08:16:53 2016
@@ -89,7 +89,7 @@ class TestCase_launch(unittest.TestCase)
def test_failurecode(self):
try:
svnmerge.launch(self.cmd*10)
- except svnmerge.LaunchError, (ret, cmd, out):
+ except svnmerge.LaunchError as (ret, cmd, out):
self.assertNotEqual(ret, 0)
self.assertNotEqual(ret, None)
self.assert_(out)
@@ -254,7 +254,7 @@ class TestCase_SvnMerge(unittest.TestCas
reset_svnmerge()
ret = svnmerge.main(args)
- except SystemExit, e:
+ except SystemExit as e:
ret = e.code
finally:
sys.stdout = sys.__stdout__
@@ -302,7 +302,7 @@ class TestCase_SvnMerge(unittest.TestCas
def launch(self, cmd, **kwargs):
try:
out = svnmerge.launch(cmd, split_lines=False)
- except svnmerge.LaunchError, (ret, cmd, out):
+ except svnmerge.LaunchError as (ret, cmd, out):
return self._parseoutput(ret, out, **kwargs)
return self._parseoutput(0, out, **kwargs)
Modified: subversion/trunk/contrib/server-side/add-needs-lock.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/add-needs-lock.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/add-needs-lock.py (original)
+++ subversion/trunk/contrib/server-side/add-needs-lock.py Sat Apr 30 08:16:53 2016
@@ -46,7 +46,7 @@ try:
import svn.core
import svn.fs
import svn.repos
-except ImportError, e:
+except ImportError as e:
print >> sys.stderr, "ERROR: Unable to import Subversion's Python bindings: '%s'" % e
sys.exit(1)
Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py Sat Apr 30 08:16:53 2016
@@ -226,7 +226,7 @@ def fix_one_error(repo_dir, rev):
return True
else:
verbose_print("Unrecognized error message; trying 'svnlook' instead.")
- except FixError, e:
+ except FixError as e:
print 'warning:', e
verbose_print("Trying 'svnlook' instead.")
@@ -295,6 +295,6 @@ if __name__ == '__main__':
try:
fix_rev(repo_dir, rev)
- except FixError, e:
+ except FixError as e:
print 'error:', e
sys.exit(1)
Modified: subversion/trunk/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsverify.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsverify.py (original)
+++ subversion/trunk/contrib/server-side/fsfsverify.py Sat Apr 30 08:16:53 2016
@@ -344,7 +344,7 @@ class Window(object):
self.instrByteStream = ZlibByteStream(self.origInstrStream,
self.compressedInstrLength)
self.isInstrCompressed = True
- except Exception, e:
+ except Exception as e:
new_e = InvalidCompressedStream(
"Invalid compressed instr stream at offset %d (%s)" % (offset,
str(e)),
@@ -359,7 +359,7 @@ class Window(object):
self.dataByteStream = ZlibByteStream(self.origDataStream,
self.compressedDataLength)
self.isDataCompressed = True
- except Exception, e:
+ except Exception as e:
new_e = InvalidCompressedStream(
"Invalid compressed data stream at offset %d (%s, %s)\n" % (
offset, str(e), repr(self)),
@@ -388,7 +388,7 @@ class Window(object):
while computedInstrLength < expectedInstrLength:
try:
instr = SvndiffInstruction(self.instrByteStream)
- except PotentiallyFixableException, e:
+ except PotentiallyFixableException as e:
e.window = self
e.windowOffset = self.windowOffset
raise
@@ -492,7 +492,7 @@ class Svndiff(object):
log(LOG_WINDOWS, 3, repr(w))
w.verify()
remaining -= w.windowLength
- except PotentiallyFixableException, e:
+ except PotentiallyFixableException as e:
e.svndiffStart = self.startingOffset
raise
@@ -580,7 +580,7 @@ class Rep(object):
try:
svndiff = Svndiff(f, self.length)
svndiff.verify()
- except Exception, e:
+ except Exception as e:
e.rep = self
e.noderev = self.noderev
raise
@@ -1209,13 +1209,13 @@ if __name__ == '__main__':
except:
sys.stdout.flush()
raise
- except InvalidRepHeader, e:
+ except InvalidRepHeader as e:
if not options.fixRlle:
handleError(e, options.showTraceback)
fixHeader(e, revFile)
- except PotentiallyFixableException, e:
+ except PotentiallyFixableException as e:
if not options.fixRlle:
handleError(e, options.showTraceback)
Modified: subversion/trunk/contrib/server-side/svn-tweak-author.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/svn-tweak-author.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/svn-tweak-author.py (original)
+++ subversion/trunk/contrib/server-side/svn-tweak-author.py Sat Apr 30 08:16:53 2016
@@ -117,7 +117,7 @@ def main():
usage_and_exit("Invalid mode (%s) provided." % (mode))
except SystemExit:
raise
- except Exception, e:
+ except Exception as e:
error_and_exit(str(e))
if __name__ == "__main__":
Modified: subversion/trunk/subversion/bindings/swig/python/tests/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/core.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/core.py Sat Apr 30 08:16:53 2016
@@ -80,7 +80,7 @@ class SubversionCoreTestCase(unittest.Te
# It must remain unchanged through the process.
try:
svn.client.info2(*args)
- except svn.core.SubversionException, exc:
+ except svn.core.SubversionException as exc:
# find the original exception
while exc.file != rec.e.file: exc = exc.child
Modified: subversion/trunk/subversion/bindings/swig/python/tests/repository.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/repository.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/repository.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/repository.py Sat Apr 30 08:16:53 2016
@@ -319,7 +319,7 @@ class SubversionRepositoryTestCase(unitt
fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, False)
try:
fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, False)
- except core.SubversionException, exc:
+ except core.SubversionException as exc:
self.assertEqual(exc.apr_err, core.SVN_ERR_FS_PATH_ALREADY_LOCKED)
fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, True)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Sat Apr 30 08:16:53 2016
@@ -659,7 +659,7 @@ class LogParser:
for i in data:
self.parser.Parse(i)
self.parser.Parse('', True)
- except xml.parsers.expat.ExpatError, e:
+ except xml.parsers.expat.ExpatError as e:
raise verify.SVNUnexpectedStdout('%s\n%s\n' % (e, ''.join(data),))
return self.entries
@@ -1889,7 +1889,7 @@ def make_repo_and_wc(sbox, create_wc=Tru
# just make sure the parent folder of our working copy is created
try:
os.mkdir(main.general_wc_dir)
- except OSError, err:
+ except OSError as err:
if err.errno != errno.EEXIST:
raise
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sat Apr 30 08:16:53 2016
@@ -258,7 +258,7 @@ def wrap_ex(func, output):
def w(*args, **kwds):
try:
return func(*args, **kwds)
- except Failure, ex:
+ except Failure as ex:
if ex.__class__ != Failure or ex.args:
ex_args = str(ex)
if ex_args:
@@ -1786,9 +1786,9 @@ class TestRunner:
print('Test driver returned a status code.')
sys.exit(255)
result = svntest.testcase.RESULT_OK
- except Skip, ex:
+ except Skip as ex:
result = svntest.testcase.RESULT_SKIP
- except Failure, ex:
+ except Failure as ex:
result = svntest.testcase.RESULT_FAIL
msg = ''
# We captured Failure and its subclasses. We don't want to print
@@ -1806,7 +1806,7 @@ class TestRunner:
except KeyboardInterrupt:
logger.error('Interrupted')
sys.exit(0)
- except SystemExit, ex:
+ except SystemExit as ex:
logger.error('EXCEPTION: SystemExit(%d), skipping cleanup' % ex.code)
self._print_name(ex.code and 'FAIL: ' or 'PASS: ')
raise
Modified: subversion/trunk/subversion/tests/cmdline/svntest/objects.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/objects.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/objects.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/objects.py Sat Apr 30 08:16:53 2016
@@ -127,7 +127,7 @@ def locate_db_dump():
try:
if subprocess.Popen([db_dump_name, "-V"]).wait() == 0:
return db_dump_name
- except OSError, e:
+ except OSError as e:
pass
return 'none'
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Sat Apr 30 08:16:53 2016
@@ -201,7 +201,7 @@ class State:
for path in args:
try:
path_ref = self.desc[to_relpath(path)]
- except KeyError, e:
+ except KeyError as e:
e.args = ["Path '%s' not present in WC state descriptor" % path]
raise
path_ref.tweak(**kw)
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Sat Apr 30 08:16:53 2016
@@ -63,7 +63,7 @@ def replace_sbox_with_tarfile(sbox, tar_
dir=None):
try:
svntest.main.safe_rmtree(sbox.wc_dir)
- except OSError, e:
+ except OSError as e:
pass
if not dir:
@@ -81,7 +81,7 @@ def replace_sbox_with_tarfile(sbox, tar_
def replace_sbox_repo_with_tarfile(sbox, tar_filename, dir=None):
try:
svntest.main.safe_rmtree(sbox.repo_dir)
- except OSError, e:
+ except OSError as e:
pass
if not dir:
Modified: subversion/trunk/tools/client-side/change-svn-wc-format.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/change-svn-wc-format.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/change-svn-wc-format.py (original)
+++ subversion/trunk/tools/client-side/change-svn-wc-format.py Sat Apr 30 08:16:53 2016
@@ -96,7 +96,7 @@ class WCFormatConverter:
print("Parsing file '%s'" % entries.path)
try:
entries.parse(self.verbosity)
- except UnrecognizedWCFormatException, e:
+ except UnrecognizedWCFormatException as e:
if self.error_on_unrecognized:
raise
sys.stderr.write("%s, skipping\n" % e)
@@ -116,7 +116,7 @@ class WCFormatConverter:
print("Checking whether WC format can be converted")
try:
entries.assert_valid_format(format_nbr, self.verbosity)
- except LossyConversionException, e:
+ except LossyConversionException as e:
# In --force mode, ignore complaints about lossy conversion.
if self.force:
print("WARNING: WC format conversion will be lossy. Dropping "\
@@ -405,7 +405,7 @@ def main():
try:
converter.change_wc_format(new_format_nbr)
- except LocalException, e:
+ except LocalException as e:
if debug:
raise
sys.stderr.write("%s\n" % e)
Modified: subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/mergeinfo-sanitizer.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/mergeinfo-sanitizer.py (original)
+++ subversion/trunk/tools/client-side/mergeinfo-sanitizer.py Sat Apr 30 08:16:53 2016
@@ -166,7 +166,7 @@ def get_new_location_segments(parsed_ori
revision_range.end, revision_range.start + 1, location_segment_callback)
except svn.core.SubversionException:
sys.stderr.write(" Could not find location segments for %s \n" % path)
- except Exception, e:
+ except Exception as e:
sys.stderr.write("")
@@ -204,7 +204,7 @@ def fix_sanitized_mergeinfo(parsed_origi
with open(hash_file, "r") as f:
old_hash = pickle.load(f)
f.close
- except IOError, e:
+ except IOError as e:
get_new_location_segments(parsed_original_mergeinfo, repo_root, wcpath, ctx)
hasher(hash_file, newmergeinfo_file)
try:
@@ -217,7 +217,7 @@ def fix_sanitized_mergeinfo(parsed_origi
with open(newmergeinfo_file, "r") as f:
new_hash = md5_of_file(f)
f.close
- except IOError, e:
+ except IOError as e:
if not mergeinfo:
get_new_location_segments(parsed_original_mergeinfo, repo_root, wcpath, ctx)
hasher(hash_file, newmergeinfo_file)
@@ -263,7 +263,7 @@ def get_original_mergeinfo(wcpath, revis
def main():
try:
opts, args = my_getopt(sys.argv[1:], "h?f", ["help", "fix"])
- except Exception, e:
+ except Exception as e:
sys.stderr.write(""" Improperly used """)
sys.exit(1)
Modified: subversion/trunk/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/contribulyze.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/contribulyze.py (original)
+++ subversion/trunk/tools/dev/contribulyze.py Sat Apr 30 08:16:53 2016
@@ -741,7 +741,7 @@ def usage():
def main():
try:
opts, args = my_getopt(sys.argv[1:], 'C:U:hH?', [ 'help' ])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
complain(str(e) + '\n\n')
usage()
sys.exit(1)
Modified: subversion/trunk/tools/dev/gen-javahl-errors.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/gen-javahl-errors.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/gen-javahl-errors.py (original)
+++ subversion/trunk/tools/dev/gen-javahl-errors.py Sat Apr 30 08:16:53 2016
@@ -27,7 +27,7 @@ import sys, os
try:
from svn import core
-except ImportError, e:
+except ImportError as e:
sys.stderr.write("ERROR: Unable to import Subversion's Python bindings: '%s'\n" \
"Hint: Set your PYTHONPATH environment variable, or adjust your " \
"PYTHONSTARTUP\nfile to point to your Subversion install " \
Modified: subversion/trunk/tools/dev/gen_junit_report.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/gen_junit_report.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/gen_junit_report.py (original)
+++ subversion/trunk/tools/dev/gen_junit_report.py Sat Apr 30 08:16:53 2016
@@ -178,7 +178,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], 'l:d:h',
['log-file=', 'output-dir=', 'help'])
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
usage(err)
log_file = None
@@ -201,7 +201,7 @@ def main():
print("Directory '%s' not exists, creating ..." % output_dir)
try:
os.makedirs(output_dir)
- except OSError, err:
+ except OSError as err:
sys.stderr.write("ERROR: %s\n" % err)
sys.exit(1)
patterns = {
@@ -221,7 +221,7 @@ def main():
fp = None
try:
fp = open(log_file, 'r')
- except IOError, err:
+ except IOError as err:
sys.stderr.write("ERROR: %s\n" % err)
sys.exit(1)
Modified: subversion/trunk/tools/dev/graph-dav-servers.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/graph-dav-servers.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/graph-dav-servers.py (original)
+++ subversion/trunk/tools/dev/graph-dav-servers.py Sat Apr 30 08:16:53 2016
@@ -181,7 +181,7 @@ def draw_graph(dates, counts):
im = im.resize((width, height), Image.ANTIALIAS)
im.save(OUTPUT_FILE, im.format)
os.unlink(OUTPUT_FILE + ".tmp.png")
- except Exception, e:
+ except Exception as e:
sys.stderr.write("Error attempting to resize the graphic: %s\n" % (str(e)))
os.rename(OUTPUT_FILE + ".tmp.png", OUTPUT_FILE)
raise
Modified: subversion/trunk/tools/dev/iz/ff2csv.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/iz/ff2csv.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/iz/ff2csv.py (original)
+++ subversion/trunk/tools/dev/iz/ff2csv.py Sat Apr 30 08:16:53 2016
@@ -66,7 +66,7 @@ manager-speak pictures."""
try:
opts, args = my_getopt(sys.argv[1:], "", [x[0] for x in long_opts])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
print("Error: %s" % e.msg)
shortusage()
print(me + " --help for options.")
Modified: subversion/trunk/tools/dev/iz/find-fix.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/iz/find-fix.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/iz/find-fix.py (original)
+++ subversion/trunk/tools/dev/iz/find-fix.py Sat Apr 30 08:16:53 2016
@@ -127,7 +127,7 @@ def main():
try:
opts, args = my_getopt(sys.argv[1:], "", [x[0] for x in long_opts])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
sys.stderr.write("Error: %s\n" % e.msg)
shortusage()
sys.stderr.write("%s --help for options.\n" % me)
Modified: subversion/trunk/tools/dev/wc-ng/bump-to-19.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/bump-to-19.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-ng/bump-to-19.py (original)
+++ subversion/trunk/tools/dev/wc-ng/bump-to-19.py Sat Apr 30 08:16:53 2016
@@ -275,7 +275,7 @@ def migrate_wc_subdirs(wc_root_path):
copy_db_rows_to_wcroot(wc_subdir_path)
move_and_shard_pristine_files(wc_subdir_path, '.')
migrated_subdirs += [wc_subdir_path]
- except (WrongFormatException, NotASubversionWC), e:
+ except (WrongFormatException, NotASubversionWC) as e:
print "skipped:", e
# don't walk into it
dirs.remove(dir)
@@ -292,7 +292,7 @@ def migrate_wc_subdirs(wc_root_path):
os.rmdir(pristine_path(wc_subdir_path))
shutil.rmtree(tmp_path(wc_subdir_path))
os.rmdir(dotsvn_path(wc_subdir_path))
- except Exception, e:
+ except Exception as e:
print e
failed_delete_subdirs += [wc_subdir_path]
@@ -346,7 +346,7 @@ if __name__ == '__main__':
try:
check_wc_format_number(wc_root_path)
- except (WrongFormatException, NotASubversionWC), e:
+ except (WrongFormatException, NotASubversionWC) as e:
print "error:", e
sys.exit(1)
Modified: subversion/trunk/tools/dev/wc-ng/populate-pristine.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/populate-pristine.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-ng/populate-pristine.py (original)
+++ subversion/trunk/tools/dev/wc-ng/populate-pristine.py Sat Apr 30 08:16:53 2016
@@ -103,6 +103,6 @@ if __name__ == '__main__':
for wc_path in paths:
try:
populate(wc_path)
- except UnknownFormat, e:
+ except UnknownFormat as e:
sys.stderr.write("Don't know how to handle '%s' (format %d)'\n"
% (wc_path, e.formatno))
Modified: subversion/trunk/tools/dev/which-error.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/which-error.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/dev/which-error.py (original)
+++ subversion/trunk/tools/dev/which-error.py Sat Apr 30 08:16:53 2016
@@ -36,7 +36,7 @@ import re
try:
from svn import core
-except ImportError, e:
+except ImportError as e:
sys.stderr.write("ERROR: Unable to import Subversion's Python bindings: '%s'\n" \
"Hint: Set your PYTHONPATH environment variable, or adjust your " \
"PYTHONSTARTUP\nfile to point to your Subversion install " \
Modified: subversion/trunk/tools/examples/get-location-segments.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/examples/get-location-segments.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/examples/get-location-segments.py (original)
+++ subversion/trunk/tools/examples/get-location-segments.py Sat Apr 30 08:16:53 2016
@@ -111,7 +111,7 @@ def prompt_func_gnome_keyring_prompt(key
def main():
try:
url, peg_revision, start_revision, end_revision = parse_args(sys.argv[1:])
- except Exception, e:
+ except Exception as e:
sys.stderr.write("""Usage: %s URL[@PEG-REV] [START-REV[:END-REV]]
Trace the history of URL@PEG-REV, printing the location(s) of its
Modified: subversion/trunk/tools/hook-scripts/svn2feed.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/svn2feed.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/svn2feed.py (original)
+++ subversion/trunk/tools/hook-scripts/svn2feed.py Sat Apr 30 08:16:53 2016
@@ -363,7 +363,7 @@ def main():
"feed-url=",
"format=",
])
- except getopt.GetoptError, msg:
+ except getopt.GetoptError as msg:
usage_and_exit(msg)
# Make sure required arguments are present.
@@ -394,7 +394,7 @@ def main():
elif opt in ("-m", "--max-items"):
try:
max_items = int(arg)
- except ValueError, msg:
+ except ValueError as msg:
usage_and_exit("Invalid value '%s' for --max-items." % (arg))
if max_items < 1:
usage_and_exit("Value for --max-items must be a positive "
@@ -427,7 +427,7 @@ def main():
cmd_out = proc.stdout.readlines()
try:
revisions = [int(cmd_out[0])]
- except IndexError, msg:
+ except IndexError as msg:
usage_and_exit("svn2feed.py: Invalid value '%s' for " \
"REPOS-PATH" % (repos_path))
else:
@@ -447,7 +447,7 @@ def main():
revisions = list(range(start, end + 1)[-max_items:])
else:
raise ValueError()
- except ValueError, msg:
+ except ValueError as msg:
usage_and_exit("svn2feed.py: Invalid value '%s' for --revision." \
% (commit_rev))
Modified: subversion/trunk/tools/hook-scripts/svnperms.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/svnperms.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/svnperms.py (original)
+++ subversion/trunk/tools/hook-scripts/svnperms.py Sat Apr 30 08:16:53 2016
@@ -296,7 +296,7 @@ class MissingArgumentsException(Exceptio
def parse_options():
try:
opts, args = my_getopt(sys.argv[1:], "f:s:r:t:R:A:h", ["help"])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
raise Error(e.msg)
class Options: pass
obj = Options()
@@ -349,11 +349,11 @@ def main():
check_perms(opts.filename, opts.section,
opts.repository, opts.transaction, opts.revision,
opts.author)
- except MissingArgumentsException, e:
+ except MissingArgumentsException as e:
sys.stderr.write("%s\n" % str(e))
sys.stderr.write(USAGE)
sys.exit(1)
- except Error, e:
+ except Error as e:
sys.stderr.write("error: %s\n" % str(e))
sys.exit(1)
Modified: subversion/trunk/tools/po/l10n-report.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/po/l10n-report.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/po/l10n-report.py (original)
+++ subversion/trunk/tools/po/l10n-report.py Sat Apr 30 08:16:53 2016
@@ -159,7 +159,7 @@ def main():
["help",
"to-email-id=",
])
- except getopt.GetoptError, msg:
+ except getopt.GetoptError as msg:
usage_and_exit(msg)
to_email_id = None
Modified: subversion/trunk/tools/server-side/fsfs-reshard.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/fsfs-reshard.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/fsfs-reshard.py (original)
+++ subversion/trunk/tools/server-side/fsfs-reshard.py Sat Apr 30 08:16:53 2016
@@ -277,7 +277,7 @@ def shard(path, max_files_per_shard, sta
tmp = path + '.reshard'
try:
os.mkdir(tmp)
- except OSError, e:
+ except OSError as e:
if e.errno != EEXIST:
raise
@@ -335,7 +335,7 @@ def main():
try:
max_files_per_shard = int(max_files_per_shard)
- except ValueError, OverflowError:
+ except ValueError as OverflowError:
sys.stderr.write("error: maximum files per shard ('%s') is not a valid number.\n" \
% max_files_per_shard)
sys.stderr.flush()
Modified: subversion/trunk/tools/server-side/svn-backup-dumps.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-backup-dumps.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-backup-dumps.py (original)
+++ subversion/trunk/tools/server-side/svn-backup-dumps.py Sat Apr 30 08:16:53 2016
@@ -471,7 +471,7 @@ class SvnBackup:
ftp.quit()
rc = len(ifd.read(1)) == 0
ifd.close()
- except Exception, e:
+ except Exception as e:
raise SvnBackupException("ftp transfer failed:\n file: '%s'\n error: %s" % \
(absfilename, str(e)))
return rc
@@ -680,7 +680,7 @@ if __name__ == "__main__":
try:
backup = SvnBackup(options, args)
rc = backup.execute()
- except SvnBackupException, e:
+ except SvnBackupException as e:
print("svn-backup-dumps.py: %s" % e)
if rc:
print("Everything OK.")
Modified: subversion/trunk/tools/server-side/svnpredumpfilter.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpredumpfilter.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpredumpfilter.py (original)
+++ subversion/trunk/tools/server-side/svnpredumpfilter.py Sat Apr 30 08:16:53 2016
@@ -291,7 +291,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "hv",
["help", "verbose", "targets="])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
usage_and_exit(str(e))
for option, value in opts:
@@ -323,7 +323,7 @@ def main():
usage_and_exit("Valid subcommands are 'include' and 'exclude'")
except SystemExit:
raise
- except (LogStreamError, EOFError), e:
+ except (LogStreamError, EOFError) as e:
log("ERROR: " + str(e), 0)
sys.exit(EXIT_FAILURE)
except:
Modified: subversion/trunk/tools/server-side/svnpubsub/daemonize.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/daemonize.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/daemonize.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/daemonize.py Sat Apr 30 08:16:53 2016
@@ -51,7 +51,7 @@ class Daemon(object):
def daemonize_exit(self):
try:
result = self.daemonize()
- except (ChildFailed, DaemonFailed), e:
+ except (ChildFailed, DaemonFailed) as e:
# duplicate the exit code
sys.exit(e.code)
except (ChildTerminatedAbnormally, ChildForkFailed,
@@ -122,7 +122,7 @@ class Daemon(object):
# perform the second fork
try:
pid = os.fork()
- except OSError, e:
+ except OSError as e:
### this won't make it to the parent process
raise DaemonForkFailed(e.errno, e.strerror)
Modified: subversion/trunk/tools/server-side/test_svn_server_log_parse.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/test_svn_server_log_parse.py?rev=1741723&r1=1741722&r2=1741723&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/test_svn_server_log_parse.py (original)
+++ subversion/trunk/tools/server-side/test_svn_server_log_parse.py Sat Apr 30 08:16:53 2016
@@ -607,5 +607,5 @@ if __name__ == '__main__':
finally:
try:
os.unlink(tmp)
- except Exception, e:
+ except Exception as e:
sys.stderr.write('os.unlink(tmp): %s\n' % (e,))