You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/06/13 20:34:55 UTC
[13/17] git commit: [#7406] remove unused by_display_name lookups
[#7406] remove unused by_display_name lookups
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f3ed5e89
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f3ed5e89
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f3ed5e89
Branch: refs/heads/db/7406
Commit: f3ed5e89b221a39bf65c2275439f64adfd4a2c7e
Parents: 177929f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Jun 11 21:31:20 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Jun 13 17:52:00 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/helpers.py | 11 ++---------
Allura/allura/lib/plugin.py | 13 -------------
Allura/allura/model/auth.py | 4 ----
3 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f3ed5e89/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index ce132ba..da731ef 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -178,16 +178,9 @@ def really_unicode(s):
return _attempt_encodings(s, encodings())
-def find_user(email=None, username=None, display_name=None):
+def find_user(email):
from allura import model as M
- user = None
- if email:
- user = M.User.by_email_address(email)
- if not user and username:
- user = M.User.by_username(username)
- if not user and display_name:
- user = M.User.by_display_name(display_name)
- return user
+ return M.User.by_email_address(email)
def find_project(url_path):
http://git-wip-us.apache.org/repos/asf/allura/blob/f3ed5e89/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 697d980..a1cc7e8 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1056,12 +1056,6 @@ class UserPreferencesProvider(object):
'''
raise NotImplementedError, 'set_pref'
- def find_by_display_name(self, name):
- '''
- :rtype: list of :class:`Users <allura.model.auth.User>`
- '''
- raise NotImplementedError, 'find_by_display_name'
-
def additional_urls(self):
'''
Returns a mapping of additional routes for AuthProvider.
@@ -1118,13 +1112,6 @@ class LocalUserPreferencesProvider(UserPreferencesProvider):
else:
setattr(user, pref_name, pref_value)
- def find_by_display_name(self, name):
- from allura import model as M
- name_regex = re.compile('(?i)%s' % re.escape(name))
- users = M.User.query.find(dict(
- display_name=name_regex)).sort('username').all()
- return users
-
class AdminExtension(object):
http://git-wip-us.apache.org/repos/asf/allura/blob/f3ed5e89/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index df0bc16..028e9dd 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -528,10 +528,6 @@ class User(MappedClass, ActivityNode, ActivityObject):
return user
return plugin.AuthenticationProvider.get(request).by_username(name)
- @classmethod
- def by_display_name(cls, name):
- return plugin.UserPreferencesProvider.get().find_by_display_name(name)
-
def get_tool_data(self, tool, key, default=None):
return self.tool_data.get(tool, {}).get(key, None)