except named exception handling

diff --git a/fdroid b/fdroid
index f4d23cbfb337f911205cb223be352eb56d0a026d..e112690f89876d8f1727280fa1043b1a0fb0ec4c 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -137,7 +137,7 @@ def main():
         sys.exit(1)
     # These should only be unexpected crashes due to bugs in the code
     # str(e) often doesn't contain a reason, so just show the backtrace
-    except Exception, e:
+    except Exception as e:
         logging.critical("Unknown exception found!")
         raise
     sys.exit(0)

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d1dfc8ff5f6e37588a6750acde2c7936030e2cfd..7f58e156def4d926fd674f8eac9a162e08296a11 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -280,9 +280,9 @@ def check_gplay(app):
     try:
         resp = urllib2.urlopen(req, None, 20)
         page = resp.read()
-    except urllib2.HTTPError, e:
+    except urllib2.HTTPError as e:
         return (None, str(e.code))
-    except Exception, e:
+    except Exception as e:
         return (None, 'Failed:' + str(e))
 
     version = None

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index aa19f1619a087e1c9163e2f60b4bee37a151e99e..2e1ff2cc4e20151aa35a429d78c4c7acd532cda1 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -516,7 +516,7 @@ class vcs:
 
         try:
             self.gotorevisionx(rev)
-        except FDroidException, e:
+        except FDroidException as e:
             exc = e
 
         # If necessary, write the .fdroidvcs file.
@@ -1602,7 +1602,7 @@ def FDroidPopen(commands, cwd=None, output=True):
     try:
         p = subprocess.Popen(commands, cwd=cwd, shell=False, env=env,
                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    except OSError, e:
+    except OSError as e:
         raise BuildException("OSError while trying to execute " +
                              ' '.join(commands) + ': ' + str(e))
 

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 7a3696b9ae5ab6aef96fa5894adfa7a8fa355f1e..e42ca169f88a19e343a0a37035ca27ad70677a39 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -800,7 +800,7 @@ def read_metadata(xref=True):
         for appid, app in apps.iteritems():
             try:
                 description_html(app.Description, linkres)
-            except MetaDataException, e:
+            except MetaDataException as e:
                 raise MetaDataException("Problem with description of " + appid +
                                         " - " + str(e))
 

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 3a01a7c21cb2db097621d45eca9fd828053c4fbf..2fd37d356d67a482173b98b9f123986f929bb105 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -331,7 +331,7 @@ def resize_icon(iconpath, density):
                 iconpath, oldsize, im.size))
             im.save(iconpath, "PNG")
 
-    except Exception, e:
+    except Exception as e:
         logging.error("Failed resizing {0} - {1}".format(iconpath, e))
 
 
@@ -490,7 +490,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                         apk['id'] = re.match(name_pat, line).group(1)
                         apk['versioncode'] = int(re.match(vercode_pat, line).group(1))
                         apk['version'] = re.match(vername_pat, line).group(1)
-                    except Exception, e:
+                    except Exception as e:
                         logging.error("Package matching failed: " + str(e))
                         logging.info("Line was: " + line)
                         sys.exit(1)
@@ -615,7 +615,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                                         os.path.join(get_icon_dir(repodir, density), iconfilename))
                             empty_densities.remove(density)
                             break
-                except Exception, e:
+                except Exception as e:
                     logging.warn("Failed reading {0} - {1}".format(iconpath, e))
 
             if apk['icons']:

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index d8373eb035fc354c0cc46a4de7109dd28dceda6e..2fb066be438f52017f1f0f5368755593229339b5 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -89,7 +89,7 @@ def main():
             logging.info("...successfully verified")
             verified += 1
 
-        except FDroidException, e:
+        except FDroidException as e:
             logging.info("...NOT verified - {0}".format(e))
             notverified += 1