diff --git a/contrib/client-side/incremental-update.py b/contrib/client-side/incremental-update.py index 9c1c2d9f572bd..93ae1270471f1 100755 --- a/contrib/client-side/incremental-update.py +++ b/contrib/client-side/incremental-update.py @@ -183,6 +183,6 @@ def main(): main() except SystemExit: raise - except Exception, e: + except Exception as e: print_error(str(e)) sys.exit(1) diff --git a/contrib/client-side/svn_apply_autoprops.py b/contrib/client-side/svn_apply_autoprops.py index dc0627939a84c..061c5c501465d 100755 --- a/contrib/client-side/svn_apply_autoprops.py +++ b/contrib/client-side/svn_apply_autoprops.py @@ -152,7 +152,7 @@ def filter_walk(autoprop_lines, dirname, filenames): 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 diff --git a/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py b/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py index fa46ee6e5b172..43b1445049184 100755 --- a/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py +++ b/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py @@ -366,7 +366,7 @@ def migrate_path(self, path): 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 diff --git a/contrib/client-side/svnmerge/svnmerge-migrate-history.py b/contrib/client-side/svnmerge/svnmerge-migrate-history.py index 48d80ace28af4..6dc1ac475a9e3 100755 --- a/contrib/client-side/svnmerge/svnmerge-migrate-history.py +++ b/contrib/client-side/svnmerge/svnmerge-migrate-history.py @@ -39,7 +39,7 @@ 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 @@ def convert_path_history(self, root, revnum, path): 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 diff --git a/contrib/client-side/svnmerge/svnmerge.py b/contrib/client-side/svnmerge/svnmerge.py index 08f15f052fc59..365f7cdbf9ae4 100755 --- a/contrib/client-side/svnmerge/svnmerge.py +++ b/contrib/client-side/svnmerge/svnmerge.py @@ -263,7 +263,7 @@ def launch(cmd, split_lines=True): 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 @@ def parse(self, args): 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) diff --git a/contrib/client-side/svnmerge/svnmerge_test.py b/contrib/client-side/svnmerge/svnmerge_test.py index e51e2c1568b45..69c4dbccf8c1b 100755 --- a/contrib/client-side/svnmerge/svnmerge_test.py +++ b/contrib/client-side/svnmerge/svnmerge_test.py @@ -89,7 +89,7 @@ def test_failure(self): 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 @@ def svnmerge2(self, args, error=False, match=None, nonmatch=None): 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 @@ def _parseoutput(self, ret, out, error=False, match=None, nonmatch=None): 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) diff --git a/contrib/server-side/add-needs-lock.py b/contrib/server-side/add-needs-lock.py index 8fecd0c4ee052..3ab3f514797a9 100755 --- a/contrib/server-side/add-needs-lock.py +++ b/contrib/server-side/add-needs-lock.py @@ -46,7 +46,7 @@ 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) diff --git a/contrib/server-side/fsfsfixer/fixer/fix-rev.py b/contrib/server-side/fsfsfixer/fixer/fix-rev.py index eea213225acde..aab96e7f67faf 100755 --- a/contrib/server-side/fsfsfixer/fixer/fix-rev.py +++ b/contrib/server-side/fsfsfixer/fixer/fix-rev.py @@ -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 @@ def fix_rev(repo_dir, rev): try: fix_rev(repo_dir, rev) - except FixError, e: + except FixError as e: print 'error:', e sys.exit(1) diff --git a/contrib/server-side/fsfsverify.py b/contrib/server-side/fsfsverify.py index 682a073057233..3e42979a9d64f 100755 --- a/contrib/server-side/fsfsverify.py +++ b/contrib/server-side/fsfsverify.py @@ -344,7 +344,7 @@ def __init__(self, byteStream, svndiffVersion): 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 @@ def __init__(self, byteStream, svndiffVersion): 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 @@ def verify(self): 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 @@ def verify(self): 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 @@ def verify(self, f, dumpInstructions, dumpWindows): 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 @@ def handleError(error, withTraceback=False): 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) diff --git a/contrib/server-side/svn-tweak-author.py b/contrib/server-side/svn-tweak-author.py index c78474d734d49..cbd185c29ad44 100755 --- a/contrib/server-side/svn-tweak-author.py +++ b/contrib/server-side/svn-tweak-author.py @@ -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__": diff --git a/subversion/bindings/swig/python/tests/core.py b/subversion/bindings/swig/python/tests/core.py index ab7d01f4ffdd3..83874fcec63b5 100644 --- a/subversion/bindings/swig/python/tests/core.py +++ b/subversion/bindings/swig/python/tests/core.py @@ -80,7 +80,7 @@ def __call__(self, path, info, pool): # 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 diff --git a/subversion/bindings/swig/python/tests/repository.py b/subversion/bindings/swig/python/tests/repository.py index 6bfc812c03237..46580b723a81f 100644 --- a/subversion/bindings/swig/python/tests/repository.py +++ b/subversion/bindings/swig/python/tests/repository.py @@ -319,7 +319,7 @@ def test_lock_unlock(self): 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) diff --git a/subversion/tests/cmdline/svntest/actions.py b/subversion/tests/cmdline/svntest/actions.py index 25ed94999be3d..32db8e7646061 100644 --- a/subversion/tests/cmdline/svntest/actions.py +++ b/subversion/tests/cmdline/svntest/actions.py @@ -659,7 +659,7 @@ def parse(self, data): 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=True, read_only=False, empty=False, # 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 diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py index 95a2efd0e4552..7f6454a1aec5f 100644 --- a/subversion/tests/cmdline/svntest/main.py +++ b/subversion/tests/cmdline/svntest/main.py @@ -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 @@ def run(self): 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 @@ def run(self): 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 diff --git a/subversion/tests/cmdline/svntest/objects.py b/subversion/tests/cmdline/svntest/objects.py index 169e5e64e8526..97bf31eba1a0e 100644 --- a/subversion/tests/cmdline/svntest/objects.py +++ b/subversion/tests/cmdline/svntest/objects.py @@ -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' diff --git a/subversion/tests/cmdline/svntest/wc.py b/subversion/tests/cmdline/svntest/wc.py index ca95c1afe9226..d1d76a28154fd 100644 --- a/subversion/tests/cmdline/svntest/wc.py +++ b/subversion/tests/cmdline/svntest/wc.py @@ -201,7 +201,7 @@ def tweak(self, *args, **kw): 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) diff --git a/subversion/tests/cmdline/upgrade_tests.py b/subversion/tests/cmdline/upgrade_tests.py index 57aabaef0393c..2f21ce60dad75 100755 --- a/subversion/tests/cmdline/upgrade_tests.py +++ b/subversion/tests/cmdline/upgrade_tests.py @@ -63,7 +63,7 @@ def replace_sbox_with_tarfile(sbox, tar_filename, 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_filename, 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: diff --git a/tools/client-side/change-svn-wc-format.py b/tools/client-side/change-svn-wc-format.py index 5338b0d4bdd50..d7302d1183af6 100755 --- a/tools/client-side/change-svn-wc-format.py +++ b/tools/client-side/change-svn-wc-format.py @@ -96,7 +96,7 @@ def write_dir_format(self, format_nbr, dirname, paths): 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 @@ def write_dir_format(self, format_nbr, dirname, paths): 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) diff --git a/tools/client-side/mergeinfo-sanitizer.py b/tools/client-side/mergeinfo-sanitizer.py index 54d415c8a7be4..e3201c676681d 100755 --- a/tools/client-side/mergeinfo-sanitizer.py +++ b/tools/client-side/mergeinfo-sanitizer.py @@ -166,7 +166,7 @@ def get_new_location_segments(parsed_original_mergeinfo, repo_root, 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_original_mergeinfo, repo_root, wcpath, 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_original_mergeinfo, repo_root, wcpath, 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, revision, depth, ctx, temp_pool): 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) diff --git a/tools/dev/contribulyze.py b/tools/dev/contribulyze.py index 1730c57e18087..8afc6087e9a07 100755 --- a/tools/dev/contribulyze.py +++ b/tools/dev/contribulyze.py @@ -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) diff --git a/tools/dev/gen-javahl-errors.py b/tools/dev/gen-javahl-errors.py index d00ed0855d66a..c949d4aed26f2 100755 --- a/tools/dev/gen-javahl-errors.py +++ b/tools/dev/gen-javahl-errors.py @@ -27,7 +27,7 @@ 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 " \ diff --git a/tools/dev/gen_junit_report.py b/tools/dev/gen_junit_report.py index 9aa28b00905fd..62dc6e78703ae 100755 --- a/tools/dev/gen_junit_report.py +++ b/tools/dev/gen_junit_report.py @@ -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) diff --git a/tools/dev/graph-dav-servers.py b/tools/dev/graph-dav-servers.py index c2174f2c9266c..86ae4752bfdbc 100755 --- a/tools/dev/graph-dav-servers.py +++ b/tools/dev/graph-dav-servers.py @@ -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 diff --git a/tools/dev/iz/ff2csv.py b/tools/dev/iz/ff2csv.py index 1820845dc2e37..dca127e0852e1 100755 --- a/tools/dev/iz/ff2csv.py +++ b/tools/dev/iz/ff2csv.py @@ -66,7 +66,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: print("Error: %s" % e.msg) shortusage() print(me + " --help for options.") diff --git a/tools/dev/iz/find-fix.py b/tools/dev/iz/find-fix.py index 513ccadfa750f..8761b8ea7b72f 100755 --- a/tools/dev/iz/find-fix.py +++ b/tools/dev/iz/find-fix.py @@ -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) diff --git a/tools/dev/wc-ng/bump-to-19.py b/tools/dev/wc-ng/bump-to-19.py index 9f9dde204dddb..31b05e838d828 100755 --- a/tools/dev/wc-ng/bump-to-19.py +++ b/tools/dev/wc-ng/bump-to-19.py @@ -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 @@ def bump_wc_format_number(wc_path): try: check_wc_format_number(wc_root_path) - except (WrongFormatException, NotASubversionWC), e: + except (WrongFormatException, NotASubversionWC) as e: print "error:", e sys.exit(1) diff --git a/tools/dev/wc-ng/populate-pristine.py b/tools/dev/wc-ng/populate-pristine.py index 8857371a43db3..4778cfc9b7523 100755 --- a/tools/dev/wc-ng/populate-pristine.py +++ b/tools/dev/wc-ng/populate-pristine.py @@ -103,6 +103,6 @@ def populate(wc_path): 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)) diff --git a/tools/dev/which-error.py b/tools/dev/which-error.py index 190399f099fbf..5bc941caf8a47 100755 --- a/tools/dev/which-error.py +++ b/tools/dev/which-error.py @@ -36,7 +36,7 @@ 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 " \ diff --git a/tools/examples/get-location-segments.py b/tools/examples/get-location-segments.py index c8b3639a61f54..7a73d39d8cab8 100755 --- a/tools/examples/get-location-segments.py +++ b/tools/examples/get-location-segments.py @@ -111,7 +111,7 @@ def prompt_func_gnome_keyring_prompt(keyring, pool): 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 diff --git a/tools/hook-scripts/svn2feed.py b/tools/hook-scripts/svn2feed.py index 4e640aa673a73..2146f127721ed 100755 --- a/tools/hook-scripts/svn2feed.py +++ b/tools/hook-scripts/svn2feed.py @@ -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)) diff --git a/tools/hook-scripts/svnperms.py b/tools/hook-scripts/svnperms.py index d1034951fca80..4275b1b15b28f 100755 --- a/tools/hook-scripts/svnperms.py +++ b/tools/hook-scripts/svnperms.py @@ -296,7 +296,7 @@ class MissingArgumentsException(Exception): 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) diff --git a/tools/po/l10n-report.py b/tools/po/l10n-report.py index b893ae92d61b9..ea9f0ccc1a894 100755 --- a/tools/po/l10n-report.py +++ b/tools/po/l10n-report.py @@ -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 diff --git a/tools/server-side/fsfs-reshard.py b/tools/server-side/fsfs-reshard.py index 8397154501719..a37c251afc8e0 100755 --- a/tools/server-side/fsfs-reshard.py +++ b/tools/server-side/fsfs-reshard.py @@ -277,7 +277,7 @@ def shard(path, max_files_per_shard, start, end): 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() diff --git a/tools/server-side/svn-backup-dumps.py b/tools/server-side/svn-backup-dumps.py index 1fd2363de088f..ad05351506765 100755 --- a/tools/server-side/svn-backup-dumps.py +++ b/tools/server-side/svn-backup-dumps.py @@ -471,7 +471,7 @@ def transfer_ftp(self, absfilename, filename): 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 @@ def execute(self): 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.") diff --git a/tools/server-side/svnpredumpfilter.py b/tools/server-side/svnpredumpfilter.py index f6a97c2960c9a..58f159c3d3543 100755 --- a/tools/server-side/svnpredumpfilter.py +++ b/tools/server-side/svnpredumpfilter.py @@ -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: diff --git a/tools/server-side/svnpubsub/daemonize.py b/tools/server-side/svnpubsub/daemonize.py index 41b1becbbdf92..1b4a2628eb6ad 100644 --- a/tools/server-side/svnpubsub/daemonize.py +++ b/tools/server-side/svnpubsub/daemonize.py @@ -51,7 +51,7 @@ def foreground(self): 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 @@ def _first_child(self, child_is_ready, child_completed): # 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) diff --git a/tools/server-side/test_svn_server_log_parse.py b/tools/server-side/test_svn_server_log_parse.py index 2fa87593e5a16..efc642c0106a7 100755 --- a/tools/server-side/test_svn_server_log_parse.py +++ b/tools/server-side/test_svn_server_log_parse.py @@ -607,5 +607,5 @@ def handle_update(self, path, revision, depth, send_copyfrom_args): finally: try: os.unlink(tmp) - except Exception, e: + except Exception as e: sys.stderr.write('os.unlink(tmp): %s\n' % (e,))