change how exeptions are handled, so they can be used by python3

sentido · Feb 2, 2014 · 9d51168 · 9d51168
1 parent a36b7da
commit 9d51168
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/userena/contrib/umessages/templatetags/umessages_tags.py b/userena/contrib/umessages/templatetags/umessages_tags.py
@@ -53,10 +53,10 @@ def get_unread_message_count_for(parser, token):
     try:
         tag_name, arg = token.contents.split(None, 1)
     except ValueError:
-        raise template.TemplateSyntaxError, "%s tag requires arguments" % token.contents.split()[0]
+        raise template.TemplateSyntaxError("%s tag requires arguments" % token.contents.split()[0])
     m = re.search(r'(.*?) as (\w+)', arg)
     if not m:
-        raise template.TemplateSyntaxError, "%s tag had invalid arguments" % tag_name
+        raise template.TemplateSyntaxError("%s tag had invalid arguments" % tag_name)
     user, var_name = m.groups()
     return MessageCount(user, var_name)
 
@@ -77,9 +77,9 @@ def get_unread_message_count_between(parser, token):
     try:
         tag_name, arg = token.contents.split(None, 1)
     except ValueError:
-        raise template.TemplateSyntaxError, "%s tag requires arguments" % token.contents.split()[0]
+        raise template.TemplateSyntaxError("%s tag requires arguments" % token.contents.split()[0])
     m = re.search(r'(.*?) and (.*?) as (\w+)', arg)
     if not m:
-        raise template.TemplateSyntaxError, "%s tag had invalid arguments" % tag_name
+        raise template.TemplateSyntaxError("%s tag had invalid arguments" % tag_name)
     um_from_user, um_to_user, var_name = m.groups()
     return MessageCount(um_from_user, var_name, um_to_user)
diff --git a/userena/forms.py b/userena/forms.py
@@ -193,7 +193,7 @@ def __init__(self, user, *args, **kwargs):
         """
         super(ChangeEmailForm, self).__init__(*args, **kwargs)
         if not isinstance(user, get_user_model()):
-            raise TypeError, "user must be an instance of %s" % get_user_model().__name__
+            raise TypeError("user must be an instance of %s" % get_user_model().__name__)
         else: self.user = user
 
     def clean_email(self):

diff --git a/userena/managers.py b/userena/managers.py
@@ -124,7 +124,7 @@ def reissue_activation(self, activation_key):
             userena.user.save(using=self._db)
             userena.send_activation_email()
             return True
-        except Exception,e:
+        except Exception:
             return False
 
     def activate_user(self, activation_key):

diff --git a/userena/views.py b/userena/views.py
@@ -218,7 +218,7 @@ def activate(request, activation_key,
             extra_context['activation_key'] = activation_key
             return ExtraContextTemplateView.as_view(template_name=retry_template_name,
                                                 extra_context=extra_context)(request)
-    except UserenaSignup.DoesNotExist,e:
+    except UserenaSignup.DoesNotExist:
         if not extra_context: extra_context = dict()
         return ExtraContextTemplateView.as_view(template_name=template_name,
                                                 extra_context=extra_context)(request)