Issue 4382 - Use new syntax to catch exceptions in sitescripts

sitescripts/subscriptions/bin/updateStatusPage.py

 # 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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import sys
 import os
 from urlparse import urlparse
 import eventlet
 from eventlet.green import urllib2
 from sitescripts.utils import get_config, get_template, setupStderr
 import sitescripts.subscriptions.subscriptionParser as subscriptionParser
 
 
 def checkURL(url):
     try:
         result = urllib2.urlopen(url, timeout=60).read(1)
         return (url, True)
-    except urllib2.HTTPError, e:
+    except urllib2.HTTPError as e:
         return (url, e.code)
     except:
         return (url, False)
 
 
 def checkSite(site):
     try:
         result = urllib2.urlopen('http://downforeveryoneorjustme.com/' + site, timeout=60).read()
         if re.search(r'\blooks down\b', result):
             return (site, False)
@@ skipping 49 matching lines @@
             })
     return result
 
 if __name__ == '__main__':
     setupStderr()
 
     subscriptions = checkSubscriptions()
     outputFile = get_config().get('subscriptions', 'statusPage')
     template = get_template(get_config().get('subscriptions', 'statusTemplate'))
     template.stream({'subscriptions': subscriptions}).dump(outputFile, encoding='utf-8')