Author: danielsh
Date: Mon Dec 21 15:02:31 2015
New Revision: 1721179
URL: http://svn.apache.org/viewvc?rev=1721179&view=rev
Log:
hot-backup.py: Modernize Python syntax.
* tools/backup/hot-backup.py.in: Drop syntaxes unsupported by ≥py3.0, while
retaining compatibility with ≥py2.6. (Both trunk and 1.9.x require ≥py2.7.)
Modified:
subversion/trunk/tools/backup/hot-backup.py.in
Modified: subversion/trunk/tools/backup/hot-backup.py.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/backup/hot-backup.py.in?rev=1721179&r1=1721178&r2=1721179&view=diff
==============================================================================
--- subversion/trunk/tools/backup/hot-backup.py.in (original)
+++ subversion/trunk/tools/backup/hot-backup.py.in Mon Dec 21 15:02:31 2015
@@ -70,7 +70,7 @@ def chmod_tree(path, mode, mask):
def safe_rmtree(dirname, retry=0):
"Remove the tree at DIRNAME, making it writable first"
def rmtree(dirname):
- chmod_tree(dirname, 0666, 0666)
+ chmod_tree(dirname, 0o666, 0o666)
shutil.rmtree(dirname)
if not os.path.exists(dirname):
@@ -117,7 +117,7 @@ try:
"num-backups=",
"verify",
"help"])
-except getopt.GetoptError, e:
+except getopt.GetoptError as e:
sys.stderr.write("ERROR: %s\n\n" % e)
sys.stderr.flush()
usage(sys.stderr)
@@ -231,7 +231,7 @@ print("Beginning hot backup of '"+ repo_
try:
youngest = get_youngest_revision()
-except Exception, e:
+except Exception as e:
sys.stderr.write("%s\n" % e)
sys.stderr.flush()
sys.exit(1)
@@ -299,10 +299,10 @@ if archive_type:
tar = tarfile.open(archive_path, 'w:' + archive_type)
tar.add(backup_subdir, os.path.basename(backup_subdir))
tar.close()
- except ImportError, e:
+ except ImportError as e:
err_msg = "Import failed: " + str(e)
err_code = -2
- except tarfile.TarError, e:
+ except tarfile.TarError as e:
err_msg = "Tar failed: " + str(e)
err_code = -3
@@ -325,10 +325,10 @@ if archive_type:
for dirpath, dirs, files in os.walk(backup_subdir):
add_to_zip(zp, backup_dir, dirpath, dirs + files)
zp.close()
- except ImportError, e:
+ except ImportError as e:
err_msg = "Import failed: " + str(e)
err_code = -4
- except zipfile.error, e:
+ except zipfile.error as e:
err_msg = "Zip failed: " + str(e)
err_code = -5
