commit: 16687673a416f392347d1665dad61b0dd8c5aab3
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 00:35:07 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Wed May 14 23:44:30 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=16687673
Alters "Exception, error" to "Exception as error"
This changes the all instances of the phrase "Exception, error" to
"Exception as error" to allow py2/py3 compatibility.
---
layman/api.py | 16 ++++++++--------
layman/cli.py | 2 +-
layman/dbbase.py | 4 ++--
layman/makeconf.py | 4 ++--
layman/overlays/overlay.py | 2 +-
layman/overlays/source.py | 2 +-
layman/overlays/tar.py | 10 +++++-----
layman/remotedb.py | 10 +++++-----
layman/updater.py | 2 +-
layman/utils.py | 2 +-
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/layman/api.py b/layman/api.py
index 11534fd..475691b 100755
--- a/layman/api.py
+++ b/layman/api.py
@@ -113,7 +113,7 @@ class LaymanAPI(object):
try:
self._get_installed_db().delete(
self._get_installed_db().select(ovl))
- except Exception, e:
+ except Exception as e:
self._error(
"Exception caught disabling repository '"+ovl+
"':\n"+str(e))
@@ -147,7 +147,7 @@ class LaymanAPI(object):
try:
success = self._get_installed_db().add(
self._get_remote_db().select(ovl))
- except Exception, e:
+ except Exception as e:
self._error("Exception caught enabling repository '"+ovl+
"' : "+str(e))
results.append(success)
@@ -201,7 +201,7 @@ class LaymanAPI(object):
continue
try:
overlay = db.select(ovl)
- except UnknownOverlayException, error:
+ except UnknownOverlayException as error:
self._error(error)
result[ovl] = ('', False, False)
else:
@@ -255,7 +255,7 @@ class LaymanAPI(object):
overlay = db.select(ovl)
#print "overlay = ", ovl
#print "!!!", overlay
- except UnknownOverlayException, error:
+ except UnknownOverlayException as error:
#print "ERRORS", str(error)
self._error(error)
result[ovl] = ('', False, False)
@@ -311,7 +311,7 @@ class LaymanAPI(object):
#self.output.debug("API.sync(); selecting %s, db = %s" % (ovl,
str(db)), 5)
odb = db.select(ovl)
self.output.debug("API.sync(); %s now selected" %ovl, 5)
- except UnknownOverlayException, error:
+ except UnknownOverlayException as error:
#self.output.debug("API.sync(); UnknownOverlayException
selecting %s" %ovl, 5)
#self._error(str(error))
fatals.append((ovl,
@@ -364,7 +364,7 @@ class LaymanAPI(object):
self.output.debug("API.sync(); starting db.sync(ovl)", 5)
db.sync(ovl)
success.append((ovl,'Successfully synchronized overlay "' +
ovl + '".'))
- except Exception, error:
+ except Exception as error:
fatals.append((ovl,
'Failed to sync overlay "' + ovl + '".\nError was: '
+ str(error)))
@@ -457,7 +457,7 @@ class LaymanAPI(object):
self.output.debug(
'LaymanAPI.fetch_remote_list(); cache updated = %s'
% str(dbreload),8)
- except Exception, error:
+ except Exception as error:
self.output.error('Failed to fetch overlay list!\n Original Error
was: '
+ str(error))
return False
@@ -585,7 +585,7 @@ class LaymanAPI(object):
elif self.config['news_reporter'] == 'pkgcore':
# pkgcore is not yet capable
return
- except Exception, err:
+ except Exception as err:
msg = "update_news() failed running %s news reporter function\n" +\
"Error was; %s"
self._error(msg % (self.config['news_reporter'], err))
diff --git a/layman/cli.py b/layman/cli.py
index a5d2799..258e3b9 100644
--- a/layman/cli.py
+++ b/layman/cli.py
@@ -173,7 +173,7 @@ class Main(object):
try:
new_umask = int(umask, 8)
old_umask = os.umask(new_umask)
- except Exception, error:
+ except Exception as error:
self.output.die('Failed setting to umask "' + umask +
'"!\nError was: ' + str(error))
diff --git a/layman/dbbase.py b/layman/dbbase.py
index e5c0fd9..8d57a9f 100644
--- a/layman/dbbase.py
+++ b/layman/dbbase.py
@@ -124,7 +124,7 @@ class DbBase(object):
df = fileopen(path, 'r')
document = df.read()
- except Exception, error:
+ except Exception as error:
if not self.ignore_init_read_errors:
self.output.error('Failed to read the overlay list at ("'
+ path + '")')
@@ -231,7 +231,7 @@ class DbBase(object):
""")
tree.write(f, encoding='utf-8')
f.close()
- except Exception, error:
+ except Exception as error:
raise Exception('Failed to write to local overlays file: '
+ path + '\nError was:\n' + str(error))
diff --git a/layman/makeconf.py b/layman/makeconf.py
index 9740072..1abe318 100644
--- a/layman/makeconf.py
+++ b/layman/makeconf.py
@@ -273,7 +273,7 @@ class MakeConf:
make_conf.close()
- except Exception, error:
+ except Exception as error:
self.output.error('MakeConf: write(); Failed to write "'
+ self.path + '".\nError was:\n' + str(error))
return False
@@ -290,7 +290,7 @@ class MakeConf:
make_conf.close()
- except Exception, error:
+ except Exception as error:
self.output.error('MakeConf: content(); Failed to read "' +
self.path + '".\nError was:\n' + str(error))
raise error
diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 65c148b..0c2d042 100755
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -414,7 +414,7 @@ class Overlay(object):
# Worked, throw other sources away
self.sources = [s]
break
- except Exception, error:
+ except Exception as error:
self.output.warn(str(error), 4)
first_s = False
return res
diff --git a/layman/overlays/source.py b/layman/overlays/source.py
index 2b79f2c..69c59bb 100644
--- a/layman/overlays/source.py
+++ b/layman/overlays/source.py
@@ -177,7 +177,7 @@ class OverlaySource(object):
self.output.warn("Checking for cleanup actions to perform", 4)
self.cleanup()
result = 1
- except Exception, err:
+ except Exception as err:
self.output.error(
'Unknown exception running command: %s' % command_repr)
self.output.error('Original error was: %s' % str(err))
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
index c6f2443..e57096d 100644
--- a/layman/overlays/tar.py
+++ b/layman/overlays/tar.py
@@ -111,7 +111,7 @@ class TarOverlay(OverlaySource):
try:
tar = urllib2.urlopen(tar_url).read()
- except Exception, error:
+ except Exception as error:
raise Exception('Failed to fetch the tar package from: '
+ self.src + '\nError was:' + str(error))
@@ -121,7 +121,7 @@ class TarOverlay(OverlaySource):
out_file = open(pkg, 'w+b')
out_file.write(tar)
out_file.close()
- except Exception, error:
+ except Exception as error:
raise Exception('Failed to store tar package in '
+ pkg + '\nError was:' + str(error))
@@ -140,7 +140,7 @@ class TarOverlay(OverlaySource):
try:
self.output.info('Deleting directory "%s"' % folder, 2)
shutil.rmtree(folder)
- except Exception, error:
+ except Exception as error:
raise Exception('Failed to remove unnecessary tar structure "'
+ folder + '"\nError was:' + str(error))
@@ -149,7 +149,7 @@ class TarOverlay(OverlaySource):
try:
result = self._extract(base=base, tar_url=self.src,
dest_dir=temp_path)
- except Exception, error:
+ except Exception as error:
try_to_wipe(temp_path)
raise error
@@ -165,7 +165,7 @@ class TarOverlay(OverlaySource):
try:
os.rename(source, final_path)
- except Exception, error:
+ except Exception as error:
raise Exception('Failed to rename tar subdirectory ' +
source + ' to ' + final_path +
'\nError was:' + str(error))
diff --git a/layman/remotedb.py b/layman/remotedb.py
index 98dffbb..38d9fa8 100644
--- a/layman/remotedb.py
+++ b/layman/remotedb.py
@@ -245,7 +245,7 @@ class RemoteDB(DbBase):
if not os.path.exists(os.path.dirname(mpath)):
try:
os.makedirs(os.path.dirname(mpath))
- except OSError, error:
+ except OSError as error:
raise OSError('Failed to create layman storage directory ' +
os.path.dirname(mpath) + '\n' +
'Error was:' + str(error))
@@ -290,7 +290,7 @@ class RemoteDB(DbBase):
self.output.info('Remote list already up to date: %s'
% url, 4)
self.output.info('Last-modified: %s' % timestamp, 4)
- except IOError, error:
+ except IOError as error:
self.output.error('RemoteDB._fetch_file(); Failed to update the '
'overlay list from: %s\nIOError was:%s\n'
% (url, str(error)))
@@ -333,7 +333,7 @@ class RemoteDB(DbBase):
verify=verify,
proxies=self.proxies,
)
- except SSLError, error:
+ except SSLError as error:
self.output.error('RemoteDB._fetch_url(); Failed to update the '
'overlay list from: %s\nSSLError was:%s\n'
% (url, str(error)))
@@ -388,7 +388,7 @@ class RemoteDB(DbBase):
try:
self.read(olist, origin=url)
- except Exception, error:
+ except Exception as error:
self.output.debug("RemoteDB._check_download(), url=%s \nolist:\n"
% url,2)
self.output.debug(olist, 2)
@@ -419,7 +419,7 @@ class RemoteDB(DbBase):
has_updates = True
- except Exception, error:
+ except Exception as error:
raise IOError('Failed to temporarily cache overlays list in'
' ' + mpath + '\nError was:\n' + str(error))
return has_updates
diff --git a/layman/updater.py b/layman/updater.py
index f7d91e6..7c46707 100644
--- a/layman/updater.py
+++ b/layman/updater.py
@@ -23,7 +23,7 @@ def rename_db(config, newname, output):
"name is...: %s" %newname, 2)
output.notice('')
return
- except OSError, err:
+ except OSError as err:
output.error(" Automatic db rename failed:\n%s" %str(err))
else:
output.info(" Automatic db rename, failed access to: %s"
diff --git a/layman/utils.py b/layman/utils.py
index ab9904f..f174215 100644
--- a/layman/utils.py
+++ b/layman/utils.py
@@ -174,7 +174,7 @@ def delete_empty_directory(mdir, output=None):
output.info('Deleting _empty_ directory "%s"' % mdir, 2)
try:
os.rmdir(mdir)
- except OSError, error:
+ except OSError as error:
output.warn(str(error))
else:
output.warn('Insufficient permissions to delete _empty_ folder
"%s".' % mdir)
