From dc2ca3fe7185126cd455a7b96c7c72ca958411da Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 14 Dec 2012 01:11:17 +0000
Subject: [PATCH] Remove last traces of authz.py

---
 ckan/authz.py                         | 2 --
 ckan/controllers/admin.py             | 1 -
 ckan/controllers/package.py           | 1 -
 ckan/controllers/revision.py          | 1 -
 ckan/lib/base.py                      | 1 -
 ckan/lib/dictization/model_dictize.py | 1 -
 ckan/logic/__init__.py                | 1 -
 ckan/logic/action/get.py              | 1 -
 ckan/logic/action/update.py           | 1 -
 ckan/model/authz.py                   | 2 +-
 ckan/tests/functional/api/base.py     | 1 -
 11 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 ckan/authz.py

diff --git a/ckan/authz.py b/ckan/authz.py
deleted file mode 100644
index f666b74e018..00000000000
--- a/ckan/authz.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Old Auth functions have been removed logic.auth functions now provide the
-# sole ckan authorization system
diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py
index 4d2aca66eb5..fc809e560ea 100644
--- a/ckan/controllers/admin.py
+++ b/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
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index 67b28eff029..8305fee5dc4 100644
--- a/ckan/controllers/package.py
+++ b/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
diff --git a/ckan/controllers/revision.py b/ckan/controllers/revision.py
index 798e80995d0..b3e6a5dfdf9 100644
--- a/ckan/controllers/revision.py
+++ b/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):
diff --git a/ckan/lib/base.py b/ckan/lib/base.py
index fa072e9cdb4..4fd2953ed21 100644
--- a/ckan/lib/base.py
+++ b/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
diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py
index 57eac178d7e..247822c1cf6 100644
--- a/ckan/lib/dictization/model_dictize.py
+++ b/ckan/lib/dictization/model_dictize.py
@@ -2,7 +2,6 @@
 from pylons import config
 from sqlalchemy.sql import select
 import datetime
-import ckan.authz
 import ckan.model
 import ckan.misc
 import ckan.logic as logic
diff --git a/ckan/logic/__init__.py b/ckan/logic/__init__.py
index 85665b76f6d..e249bf652f3 100644
--- a/ckan/logic/__init__.py
+++ b/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
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 8c4de91d91d..9c56845d947 100644
--- a/ckan/logic/action/get.py
+++ b/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
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
index 66e2975c98e..8c4585c25ba 100644
--- a/ckan/logic/action/update.py
+++ b/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
diff --git a/ckan/model/authz.py b/ckan/model/authz.py
index 80833c285be..d42c08f49e3 100644
--- a/ckan/model/authz.py
+++ b/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([])
diff --git a/ckan/tests/functional/api/base.py b/ckan/tests/functional/api/base.py
index 2f20ee57bab..d6fc07b79d6 100644
--- a/ckan/tests/functional/api/base.py
+++ b/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