summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@rackspace.com>2011-06-15 15:20:26 -0500
committerDolph Mathews <dolph.mathews@rackspace.com>2011-06-15 15:20:26 -0500
commit091fd30f7fc82fd5ca3f3a504576732c41ff185a (patch)
tree7486825c0aa0d2e328229c26ec2e3dbe9a2e9632
parentf537c222a003fa2fdb09e8790680415f5b47b824 (diff)
Removed duplicated function
-rwxr-xr-xkeystone/db/sqlalchemy/api.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/keystone/db/sqlalchemy/api.py b/keystone/db/sqlalchemy/api.py
index 9edcc0e6..ce655c31 100755
--- a/keystone/db/sqlalchemy/api.py
+++ b/keystone/db/sqlalchemy/api.py
@@ -689,14 +689,6 @@ def user_delete_tenant(id, tenant_id, session=None):
session.delete(group_user)
-def user_get_by_tenant(user_id, tenant_id, session=None):
- if not session:
- session = get_session()
- result = session.query(models.User).filter_by(id=user_id,
- tenant_id=tenant_id).first()
- return result
-
-
def users_get_by_tenant(user_id, tenant_id, session=None):
if not session:
session = get_session()
@@ -867,7 +859,7 @@ def users_get_page(marker, limit, session=None):
return session.query(user).\
order_by("id").limit(limit).all()
-def users_get_page_markers(marker, limit,\
+def users_get_page_markers(marker, limit, \
session=None):
if not session:
session = get_session()
@@ -930,7 +922,7 @@ def users_get_by_tenant_get_page(tenant_id, marker, limit, session=None):
"id").limit(limit).all()
-def users_get_by_tenant_get_page_markers(tenant_id, marker, limit,\
+def users_get_by_tenant_get_page_markers(tenant_id, marker, limit, \
session=None):
if not session:
session = get_session()