more cleans for model/package_extras

ckan/model/package_extra.py

@@ -1,25 +1,29 @@
-from meta import *
 import vdm.sqlalchemy
+import vdm.sqlalchemy.stateful
+from sqlalchemy import orm, types, Column, Table, ForeignKey
 
-from core import *
-from package import *
-from ckan.model import extension
+import meta
+import core
+import package as _package
+import extension
 import domain_object
 import types as _types
+import ckan.lib.dictization
+import activity
 
 __all__ = ['PackageExtra', 'package_extra_table', 'PackageExtraRevision',
            'extra_revision_table']
 
-package_extra_table = Table('package_extra', metadata,
-    Column('id', UnicodeText, primary_key=True, default=_types.make_uuid),
+package_extra_table = Table('package_extra', meta.metadata,
+    Column('id', types.UnicodeText, primary_key=True, default=_types.make_uuid),
     # NB: only (package, key) pair is unique
-    Column('package_id', UnicodeText, ForeignKey('package.id')),
-    Column('key', UnicodeText),
+    Column('package_id', types.UnicodeText, ForeignKey('package.id')),
+    Column('key', types.UnicodeText),
     Column('value', _types.JsonType),
 )
 
 vdm.sqlalchemy.make_table_stateful(package_extra_table)
-extra_revision_table= make_revisioned_table(package_extra_table)
+extra_revision_table= core.make_revisioned_table(package_extra_table)
 
 class PackageExtra(vdm.sqlalchemy.RevisionedObjectMixin,
         vdm.sqlalchemy.StatefulObjectMixin,
@@ -30,8 +34,6 @@ def related_packages(self):
 
     def activity_stream_detail(self, activity_id, activity_type):
         import ckan.model as model
-        import ckan.model.activity as activity
-        import ckan.lib.dictization
 
         # Handle 'deleted' extras.
         # When the user marks an extra as deleted this comes through here as a
@@ -45,14 +47,14 @@ def activity_stream_detail(self, activity_id, activity_type):
         return activity.ActivityDetail(activity_id, self.id, u"PackageExtra",
                 activity_type, {'package_extra': data_dict})
 
-mapper(PackageExtra, package_extra_table, properties={
-    'package': orm.relation(Package,
+meta.mapper(PackageExtra, package_extra_table, properties={
+    'package': orm.relation(_package.Package,
         backref=orm.backref('_extras',
             collection_class=orm.collections.attribute_mapped_collection(u'key'),
             cascade='all, delete, delete-orphan',
             ),
         ),
-    'package_no_state': orm.relation(Package,
+    'package_no_state': orm.relation(_package.Package,
         backref=orm.backref('extras_list',
             cascade='all, delete, delete-orphan',
             ),
@@ -64,19 +66,18 @@ def activity_stream_detail(self, activity_id, activity_type):
                ],
 )
 
-vdm.sqlalchemy.modify_base_object_mapper(PackageExtra, Revision, State)
-PackageExtraRevision= vdm.sqlalchemy.create_object_version(mapper, PackageExtra,
+vdm.sqlalchemy.modify_base_object_mapper(PackageExtra, core.Revision, core.State)
+PackageExtraRevision= vdm.sqlalchemy.create_object_version(meta.mapper, PackageExtra,
         extra_revision_table)
 
 PackageExtraRevision.related_packages = lambda self: [self.continuity.package]
 
 def _create_extra(key, value):
     return PackageExtra(key=unicode(key), value=value)
 
-import vdm.sqlalchemy.stateful
 _extras_active = vdm.sqlalchemy.stateful.DeferredProperty('_extras',
         vdm.sqlalchemy.stateful.StatefulDict, base_modifier=lambda x: x.get_as_of()) 
-setattr(Package, 'extras_active', _extras_active)
-Package.extras = vdm.sqlalchemy.stateful.OurAssociationProxy('extras_active', 'value',
+setattr(_package.Package, 'extras_active', _extras_active)
+_package.Package.extras = vdm.sqlalchemy.stateful.OurAssociationProxy('extras_active', 'value',
             creator=_create_extra)