Make exceptions Python 3 compatible

(Thanks to Andy Seit.)
siodoon · May 23, 2014 · e68e73e · e68e73e
1 parent 58a185a
commit e68e73e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/py/selenium/webdriver/firefox/firefox_profile.py b/py/selenium/webdriver/firefox/firefox_profile.py
@@ -1,3 +1,4 @@
+# Copyright 2014 Software Freedom Conservancy
 # Copyright 2008-2011 WebDriver committers
 # Copyright 2008-2011 Google Inc.
 #
@@ -340,8 +341,8 @@ def get_text(element):
                     manifest = f.read()
             else:
                 raise IOError('Add-on path is neither an XPI nor a directory: %s' % addon_path)
-        except (IOError, KeyError), e:
-            raise AddonFormatError, str(e), sys.exc_info()[2]
+        except (IOError, KeyError) as e:
+            raise AddonFormatError(str(e), sys.exc_info()[2])
 
         try:
             doc = minidom.parseString(manifest)
@@ -356,8 +357,8 @@ def get_text(element):
                 entry = node.nodeName.replace(em, "")
                 if entry in details.keys():
                     details.update({entry: get_text(node)})
-        except Exception, e:
-            raise AddonFormatError, str(e), sys.exc_info()[2]
+        except Exception as e:
+            raise AddonFormatError(str(e), sys.exc_info()[2])
 
         # turn unpack into a true/false value
         if isinstance(details['unpack'], basestring):