Issue 4382 - Use new syntax to catch exceptions in sitescripts

sitescripts/subscriptions/combineSubscriptions.py

 #!/usr/bin/env python
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 124 matching lines @@
             newlines = None
             if re.match(r'^https?://', filename):
                 result.append('! *** Fetched from: %s ***' % filename)
 
                 for i in range(3):
                     try:
                         request = urllib2.urlopen(filename, None, timeout)
                         data = request.read()
                         error = None
                         break
-                    except urllib2.URLError, e:
+                    except urllib2.URLError as e:
                         error = e
                         time.sleep(5)
                 if error:
                     raise error
 
                 # We should really get the charset from the headers rather than assuming
                 # that it is UTF-8. However, some of the Google Code mirrors are
                 # misconfigured and will return ISO-8859-1 as charset instead of UTF-8.
                 newlines = data.decode('utf-8').splitlines()
                 newlines = filter(lambda l: not re.search(r'^\s*!\s*(Redirect|Homepage|Title|Version|Expires)\s*:', l, re.M | re.I), newlines)
@@ skipping 153 matching lines @@
     print '''Usage: %s source_name=source_dir ... [output_dir]
 
 Options:
   -h          --help              Print this message and exit
   -t seconds  --timeout=seconds   Timeout when fetching remote subscriptions
 ''' % os.path.basename(sys.argv[0])
 
 if __name__ == '__main__':
     try:
         opts, args = getopt(sys.argv[1:], 'ht:', ['help', 'timeout='])
-    except GetoptError, e:
+    except GetoptError as e:
         print str(e)
         usage()
         sys.exit(2)
 
     target_dir = 'subscriptions'
     sources = {}
     for arg in args:
         if '=' in arg:
             source_name, source_dir = arg.split('=', 1)
             sources[source_name] = FileSource(source_dir)
         else:
             target_dir = arg
     if not sources:
         sources[''] = FileSource('.')
 
     timeout = 30
     for option, value in opts:
         if option in ('-h', '--help'):
             usage()
             sys.exit()
         elif option in ('-t', '--timeout'):
             timeout = int(value)
 
     combine_subscriptions(sources, target_dir, timeout)