Merge pull request #210 from okfn/remove-authz

[Trivial] Remove last traces of authz.py

ckan/controllers/admin.py

@@ -3,7 +3,6 @@
 import ckan.lib.base as base
 import ckan.lib.helpers as h
 import ckan.lib.app_globals as app_globals
-import ckan.authz
 import ckan.lib.authztool
 import ckan.model as model
 import ckan.logic

ckan/controllers/package.py

@@ -25,7 +25,6 @@
                         parse_params,
                         flatten_to_string_key)
 from ckan.lib.i18n import get_lang
-import ckan.authz
 import ckan.rating
 import ckan.misc
 import ckan.lib.accept as accept

ckan/controllers/revision.py

@@ -7,7 +7,6 @@
 
 from ckan.lib.base import *
 from ckan.lib.helpers import Page
-import ckan.authz
 
 
 class RevisionController(BaseController):

ckan/lib/base.py

@@ -24,7 +24,6 @@
 
 import ckan.exceptions
 import ckan
-import ckan.authz as authz
 from ckan.lib import i18n
 import lib.render
 import ckan.lib.helpers as h

ckan/lib/dictization/model_dictize.py

@@ -1,7 +1,6 @@
 import datetime
 from pylons import config
 from sqlalchemy.sql import select
-import ckan.authz
 import ckan.misc as misc
 import ckan.logic as logic
 import ckan.plugins as plugins

ckan/logic/__init__.py

@@ -4,7 +4,6 @@
 import re
 
 from ckan.lib.base import _
-import ckan.authz
 from ckan.new_authz import is_authorized
 from ckan.lib.navl.dictization_functions import flatten_dict, DataError
 from ckan.plugins import PluginImplementations

ckan/logic/action/get.py

@@ -8,7 +8,6 @@
 from pylons import c
 import sqlalchemy
 
-import ckan.authz
 import ckan.lib.dictization
 import ckan.logic as logic
 import ckan.logic.action

ckan/logic/action/update.py

@@ -6,7 +6,6 @@
 from vdm.sqlalchemy.base import SQLAlchemySession
 from paste.deploy.converters import asbool
 
-import ckan.authz as authz
 import ckan.plugins as plugins
 import ckan.logic as logic
 import ckan.logic.schema

ckan/model/authz.py

@@ -276,7 +276,7 @@ def init_authz_const_data():
     meta.Session.commit()
     meta.Session.remove()
 
-## TODO: this should be in ckan/authz.py
+## TODO: this should be removed
 def setup_user_roles(_domain_object, visitor_roles, logged_in_roles, admins=[]):
     '''NB: leaves caller to commit change'''
     assert type(admins) == type([])

ckan/tests/functional/api/base.py

@@ -13,7 +13,6 @@
 
 from ckan.tests import *
 import ckan.model as model
-import ckan.authz as authz
 from ckan.lib.create_test_data import CreateTestData
 from ckan.lib.helpers import json, url_escape
 from ckan.tests import TestController as ControllerTestCase