From 5ca182a20d601629001577d84ead6929b7faff90 Mon Sep 17 00:00:00 2001
From: NeroBurner <pyro4hell@gmail.com>
Date: Thu, 17 Sep 2015 13:25:08 +0200
Subject: [PATCH] except named exception handling

---
 fdroid                       | 2 +-
 fdroidserver/checkupdates.py | 4 ++--
 fdroidserver/common.py       | 4 ++--
 fdroidserver/metadata.py     | 2 +-
 fdroidserver/update.py       | 6 +++---
 fdroidserver/verify.py       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fdroid b/fdroid
index f4d23cbf..e112690f 100755
--- 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 d1dfc8ff..7f58e156 100644
--- 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 aa19f161..2e1ff2cc 100644
--- 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 7a3696b9..e42ca169 100644
--- 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 3a01a7c2..2fd37d35 100644
--- 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 d8373eb0..2fb066be 100644
--- 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
 
-- 
2.30.2