Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 35 insertions, 15 deletions

diff --git a/devel/utils.py b/devel/utils.py
index 85b4e42f..7dd64972 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -1,6 +1,8 @@
 import re
 
+from django.conf import settings
 from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.db import connection
 from django.db.models import Count, Q
 
@@ -44,6 +46,15 @@ SELECT pr.user_id, COUNT(*), COUNT(p.flag_date)
     return maintainers
 
 
+def ignore_does_not_exist(func):
+    def new_func(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except (ObjectDoesNotExist, MultipleObjectsReturned):
+            return None
+    return new_func
+
+
 class UserFinder(object):
     def __init__(self):
         self.cache = {}
@@ -52,18 +63,32 @@ class UserFinder(object):
         self.pgp_cache = {}
 
     @staticmethod
+    @ignore_does_not_exist
     def user_email(name, email):
         if email:
             return User.objects.get(email=email)
         return None
 
     @staticmethod
+    @ignore_does_not_exist
+    def username_email(name, email):
+        if email and '@' in email:
+            # split email addr at '@' symbol, ensure domain matches
+            # or is a subdomain of archlinux.org
+            username, domain = email.split('@', 1)
+            if re.match(settings.DOMAIN_RE, domain):
+                return User.objects.get(username=username)
+        return None
+
+    @staticmethod
+    @ignore_does_not_exist
     def profile_email(name, email):
         if email:
             return User.objects.get(userprofile__public_email=email)
         return None
 
     @staticmethod
+    @ignore_does_not_exist
     def user_name(name, email):
         # yes, a bit odd but this is the easiest way since we can't always be
         # sure how to split the name. Ensure every 'token' appears in at least
@@ -102,14 +127,12 @@ class UserFinder(object):
             email = matches.group(2)
 
         user = None
-        find_methods = (self.user_email, self.profile_email, self.user_name)
+        find_methods = (self.user_email, self.profile_email,
+                self.username_email, self.user_name)
         for matcher in find_methods:
-            try:
-                user = matcher(name, email)
-                if user != None:
-                    break
-            except (User.DoesNotExist, User.MultipleObjectsReturned):
-                pass
+            user = matcher(name, email)
+            if user is not None:
+                break
 
         self.cache[userstring] = user
         self.email_cache[email] = user
@@ -135,14 +158,11 @@ class UserFinder(object):
         if email in self.email_cache:
             return self.email_cache[email]
 
-        user = None
-        try:
-            user = self.user_email(None, email)
-        except User.DoesNotExist:
-            try:
-                user = self.profile_email(None, email)
-            except User.DoesNotExist:
-                pass
+        user = self.user_email(None, email)
+        if user is None:
+            user = self.profile_email(None, email)
+            if user is None:
+                user = self.username_email(None, email)
 
         self.email_cache[email] = user
         return user