openstack
/
keystone
Code Issues Proposed changes

Removed duplicated function

This commit is contained in:
Dolph Mathews 2011-06-15 15:20:26 -05:00
parent f537c222a0
commit 091fd30f7f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keystone/db/sqlalchemy/api.py
View File

@ -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()