[#1051] Coding standards: Fix some import *

ckan · Jun 27, 2013 · 7abd369 · 7abd369
1 parent 95dec8c
commit 7abd369
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/bin/ckan_spam.py b/bin/ckan_spam.py
@@ -14,7 +14,7 @@
 
 import os
 
-from sqlobject import *
+import sqlobject
 
 import loadconfig
 path = os.path.abspath(cfg_path)
@@ -36,7 +36,7 @@ def purge_packages_by_name():
     pkg = model.Package.byName(pkg_name)
     # for efficiency reasons best to have revisions in descending order
     sel = model.PackageRevision.select(
-            AND(model.PackageRevision.q.baseID==pkg.id,
+            sqlobject.AND(model.PackageRevision.q.baseID==pkg.id,
                 model.PackageRevision.q.revisionID>=start_at_id),
             orderBy=-model.PackageRevision.q.revisionID,
             )

diff --git a/ckan/lib/package_saver.py b/ckan/lib/package_saver.py
@@ -1,9 +1,9 @@
-from sqlalchemy import orm
 import ckan.lib.helpers as h
-from ckan.lib.base import *
+import ckan.lib.base as base
+import ckan.model as model
 import ckan.rating
-from pylons import g
-from ckan.lib.dictization import table_dictize
+
+from ckan.common import g, c, _
 
 # Todo: Factor out unused original_name argument.
 
@@ -72,14 +72,14 @@ def _update(cls, fs, log_message, author, client=None):
         fs.validate()
         validates = not (errors or fs.errors)
         if not validates:
-            raise ValidationException(fs)
+            raise base.ValidationException(fs)
         # sync
         try:
             rev = model.repo.new_revision()
             rev.author = author
             rev.message = log_message
             fs.sync()
-        except Exception, inst:
+        except Exception:
             model.Session.rollback()
             raise
         else:

diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
@@ -238,7 +238,6 @@ class TestImportFromCkan(object):
         'ckan/lib/authenticator.py',
         'ckan/lib/base.py',
         'ckan/lib/munge.py',
-        'ckan/lib/package_saver.py',
         'ckan/lib/plugins.py',
         'ckan/lib/search/index.py',
         'ckan/lib/search/query.py',
@@ -336,7 +335,6 @@ class TestImportFromCkan(object):
         'ckanext/multilingual/plugin.py',
         'ckanext/reclinepreview/tests/test_preview.py',
         'ckanext/stats/controller.py',
-        'ckanext/stats/stats.py',
         'ckanext/stats/tests/__init__.py',
         'ckanext/stats/tests/test_stats_lib.py',
         'ckanext/stats/tests/test_stats_plugin.py',
@@ -395,9 +393,7 @@ class TestImportStar(object):
     # import * is bad for many reasons and should be avoided.
 
     IMPORT_STAR_BLACKLIST_FILES = [
-        'bin/ckan_spam.py',
         'ckan/lib/helpers.py',
-        'ckan/lib/package_saver.py',
         'ckan/migration/versions/001_add_existing_tables.py',
         'ckan/migration/versions/002_add_author_and_maintainer.py',
         'ckan/migration/versions/003_add_user_object.py',
@@ -490,7 +486,6 @@ class TestImportStar(object):
         'ckan/tests/pylons_controller.py',
         'ckan/tests/test_dumper.py',
         'ckan/tests/test_wsgi_ckanclient.py',
-        'ckanext/stats/stats.py',
         'fabfile.py',
     ]
     fails = {}

diff --git a/ckanext/stats/stats.py b/ckanext/stats/stats.py
@@ -1,10 +1,10 @@
 import datetime
 
 from pylons import config
-from sqlalchemy import *
+from sqlalchemy import Table, select, func, and_
 
 import ckan.plugins as p
-from ckan import model
+import ckan.model as model
 
 cache_enabled = p.toolkit.asbool(config.get('ckanext.stats.cache_enabled', 'True'))