Update exception handling for python 3

diff --git a/hamnadmin/hamnadmin/mailqueue/admin.py b/hamnadmin/hamnadmin/mailqueue/admin.py
index 1f1d671c50df0fd5a3e1fb3a0b28f3ea879c3974..b63f317d65dcffa6c435426267e00d9378aa18a4 100644 (file)
--- a/hamnadmin/hamnadmin/mailqueue/admin.py
+++ b/hamnadmin/hamnadmin/mailqueue/admin.py
@@ -22,7 +22,7 @@ class QueuedMailAdmin(admin.ModelAdmin):
                                b = p.get_payload(decode=True)
                                if b: return b
                        return "Could not find body"
-               except Exception, e:
+               except Exception as e:
                        return "Failed to get body: %s" % e
 
        parsed_content.short_description = 'Parsed mail'

diff --git a/hamnadmin/hamnadmin/register/forms.py b/hamnadmin/hamnadmin/register/forms.py
index da4cb2f7935442693fc3caa6f292e09cda1cad3e..5330c97d43e5bdbcfc7e375fbbcadfd2c3f77d4b 100644 (file)
--- a/hamnadmin/hamnadmin/register/forms.py
+++ b/hamnadmin/hamnadmin/register/forms.py
@@ -43,7 +43,7 @@ class BlogEditForm(forms.ModelForm):
                        entries = list(fetcher.parse())
                except ParserGotRedirect:
                        raise forms.ValidationError("This URL returns a permanent redirect")
-               except Exception, e:
+               except Exception as e:
                        raise forms.ValidationError("Failed to retreive and parse feed: %s" % e)
                if len(entries) == 0:
                        for m in tracemessages:

diff --git a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
index c692a343e14520b727a244e11662c0e6b05c63b5..ffb54404cffae4d5be7f841fcb79425e87b3725f 100644 (file)
--- a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
+++ b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py
@@ -224,9 +224,9 @@ class Command(BaseCommand):
                        self.trace("Fetching %s since %s" % (fetcher.feed.feedurl, since))
                try:
                        entries = list(fetcher.parse(since))
-               except ParserGotRedirect, e:
+               except ParserGotRedirect as e:
                        return (fetcher.feed, e)
-               except Exception, e:
+               except Exception as e:
                        self.stderr.write("Failed to fetch '%s': %s" % (fetcher.feed.feedurl, e))
                        return (fetcher.feed, e)
                return (fetcher.feed, entries)

diff --git a/hamnadmin/hamnadmin/util/varnish.py b/hamnadmin/hamnadmin/util/varnish.py
index e84e51f883ad1c45d7f3e9dd4708fb21101612a1..c1cd6c140793f4c423dc93a3d4e2b25d356de09e 100644 (file)
--- a/hamnadmin/hamnadmin/util/varnish.py
+++ b/hamnadmin/hamnadmin/util/varnish.py
@@ -13,7 +13,7 @@ def purge_url(url):
                        response = urllib2.urlopen(request, timeout=2)
                        if response.getcode() != 200:
                                raise Exception("Invalid response code %s" % response.getcode())
-               except Exception, e:
+               except Exception as e:
                        raise Exception("Failed to purge '{0}': {1}'".format(url, e))
 
 def purge_root_and_feeds():