import cleans for model/user

ckan · Mar 29, 2012 · 6859450 · 6859450
1 parent f1b8aac
commit 6859450
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/ckan/model/user.py b/ckan/model/user.py
@@ -5,22 +5,23 @@
 
 from sqlalchemy.sql.expression import or_
 from sqlalchemy.orm import synonym
+from sqlalchemy import types, Column, Table
 
-from meta import *
+import meta
 import types as _types
 import domain_object
 
-user_table = Table('user', metadata,
-        Column('id', UnicodeText, primary_key=True, default=_types.make_uuid),
-        Column('name', UnicodeText, nullable=False, unique=True),
-        Column('openid', UnicodeText),
-        Column('password', UnicodeText),
-        Column('fullname', UnicodeText),
-        Column('email', UnicodeText),
-        Column('apikey', UnicodeText, default=_types.make_uuid),
-        Column('created', DateTime, default=datetime.datetime.now),
-        Column('reset_key', UnicodeText),
-        Column('about', UnicodeText),
+user_table = Table('user', meta.metadata,
+        Column('id', types.UnicodeText, primary_key=True, default=_types.make_uuid),
+        Column('name', types.UnicodeText, nullable=False, unique=True),
+        Column('openid', types.UnicodeText),
+        Column('password', types.UnicodeText),
+        Column('fullname', types.UnicodeText),
+        Column('email', types.UnicodeText),
+        Column('apikey', types.UnicodeText, default=_types.make_uuid),
+        Column('created', types.DateTime, default=datetime.datetime.now),
+        Column('reset_key', types.UnicodeText),
+        Column('about', types.UnicodeText),
         )
 
 class User(domain_object.DomainObject):
@@ -30,7 +31,7 @@ class User(domain_object.DomainObject):
 
     @classmethod
     def by_openid(cls, openid):
-        obj = Session.query(cls).autoflush(False)
+        obj = meta.Session.query(cls).autoflush(False)
         return obj.filter_by(openid=openid).first()
 
     @classmethod
@@ -39,7 +40,7 @@ def get(cls, user_reference):
         # by browsers, so correct that for the openid lookup
         corrected_openid_user_ref = cls.DOUBLE_SLASH.sub('://\\1',
                                                          user_reference)
-        query = Session.query(cls).autoflush(False)
+        query = meta.Session.query(cls).autoflush(False)
         query = query.filter(or_(cls.name==user_reference,
                                  cls.openid==corrected_openid_user_ref,
                                  cls.id==user_reference))
@@ -136,13 +137,13 @@ def as_dict(self):
     def number_of_edits(self):
         # have to import here to avoid circular imports
         import ckan.model as model
-        revisions_q = model.Session.query(model.Revision).filter_by(author=self.name)
+        revisions_q = meta.Session.query(model.Revision).filter_by(author=self.name)
         return revisions_q.count()
 
     def number_administered_packages(self):
         # have to import here to avoid circular imports
         import ckan.model as model
-        q = model.Session.query(model.PackageRole)
+        q = meta.Session.query(model.PackageRole)
         q = q.filter_by(user=self, role=model.Role.ADMIN)
         return q.count()
 
@@ -165,7 +166,7 @@ def get_group_ids(self, group_type=None):
     def get_groups(self, group_type=None, capacity=None):
         import ckan.model as model
 
-        q = model.Session.query(model.Group)\
+        q = meta.Session.query(model.Group)\
             .join(model.Member, model.Member.group_id == model.Group.id and \
                        model.Member.table_name == 'user' ).\
                join(model.User, model.User.id == model.Member.table_id).\
@@ -189,9 +190,8 @@ def search(cls, querystr, sqlalchemy_query=None):
         '''Search name, fullname, email and openid.
 
         '''
-        import ckan.model as model
         if sqlalchemy_query is None:
-            query = model.Session.query(cls)
+            query = meta.Session.query(cls)
         else:
             query = sqlalchemy_query
         qstr = '%' + querystr + '%'
@@ -202,7 +202,7 @@ def search(cls, querystr, sqlalchemy_query=None):
             ))
         return query
 
-mapper(User, user_table,
+meta.mapper(User, user_table,
     properties = {
         'password': synonym('_password', map_column=True)
     },