From 4aafbf548ba21c9b8d8d0d7486b428195a4a87ce Mon Sep 17 00:00:00 2001 From: Eevee Date: Sat, 15 May 2010 20:29:50 -0700 Subject: [PATCH] Great Migration: spline.plugins => splinext --- setup.py | 6 +++--- spline/__init__.py | 1 - {spline/plugins => splinext}/__init__.py | 0 {spline/plugins => splinext}/users/__init__.py | 14 +++++++------- {spline/plugins => splinext}/users/controllers/__init__.py | 0 {spline/plugins => splinext}/users/controllers/accounts.py | 0 {spline/plugins => splinext}/users/controllers/users.py | 0 {spline/plugins => splinext}/users/model/__init__.py | 0 .../plugins => splinext}/users/templates/css/users.mako | 0 .../plugins => splinext}/users/templates/users/lib.mako | 0 .../plugins => splinext}/users/templates/users/list.mako | 0 .../plugins => splinext}/users/templates/users/login.mako | 0 .../users/templates/users/profile.mako | 0 .../users/templates/users/profile_edit.mako | 0 .../users/templates/widgets/user_state.mako | 0 15 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 spline/__init__.py rename {spline/plugins => splinext}/__init__.py (100%) rename {spline/plugins => splinext}/users/__init__.py (84%) rename {spline/plugins => splinext}/users/controllers/__init__.py (100%) rename {spline/plugins => splinext}/users/controllers/accounts.py (100%) rename {spline/plugins => splinext}/users/controllers/users.py (100%) rename {spline/plugins => splinext}/users/model/__init__.py (100%) rename {spline/plugins => splinext}/users/templates/css/users.mako (100%) rename {spline/plugins => splinext}/users/templates/users/lib.mako (100%) rename {spline/plugins => splinext}/users/templates/users/list.mako (100%) rename {spline/plugins => splinext}/users/templates/users/login.mako (100%) rename {spline/plugins => splinext}/users/templates/users/profile.mako (100%) rename {spline/plugins => splinext}/users/templates/users/profile_edit.mako (100%) rename {spline/plugins => splinext}/users/templates/widgets/user_state.mako (100%) diff --git a/setup.py b/setup.py index 63e0bc2..b5d13ee 100644 --- a/setup.py +++ b/setup.py @@ -3,14 +3,14 @@ setup( name = 'spline-users', version = '0.1', packages = find_packages(), - + install_requires = ['spline'], include_package_data = True, zip_safe = False, - entry_points = {'spline.plugins': 'users = spline.plugins.users:UsersPlugin'}, + entry_points = {'spline.plugins': 'users = splinext.users:UsersPlugin'}, - namespace_packages = ['spline', 'spline.plugins'], + namespace_packages = ['splinext'], ) diff --git a/spline/__init__.py b/spline/__init__.py deleted file mode 100644 index de40ea7..0000000 --- a/spline/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/spline/plugins/__init__.py b/splinext/__init__.py similarity index 100% rename from spline/plugins/__init__.py rename to splinext/__init__.py diff --git a/spline/plugins/users/__init__.py b/splinext/users/__init__.py similarity index 84% rename from spline/plugins/users/__init__.py rename to splinext/users/__init__.py index e606823..39318f0 100644 --- a/spline/plugins/users/__init__.py +++ b/splinext/users/__init__.py @@ -7,9 +7,9 @@ from spline.lib.plugin import PluginBase, PluginLink, Priority import spline.model as model import spline.model.meta as meta -import spline.plugins.users.controllers.accounts -import spline.plugins.users.controllers.users -import spline.plugins.users.model +import splinext.users.controllers.accounts +import splinext.users.controllers.users +import splinext.users.model def add_routes_hook(map, *args, **kwargs): """Hook to inject some of our behavior into the routes configuration.""" @@ -50,14 +50,14 @@ def check_userid_hook(action, **params): class UsersPlugin(PluginBase): def controllers(self): return dict( - accounts = spline.plugins.users.controllers.accounts.AccountsController, - users = spline.plugins.users.controllers.users.UsersController, + accounts = splinext.users.controllers.accounts.AccountsController, + users = splinext.users.controllers.users.UsersController, ) def model(self): return [ - spline.plugins.users.model.User, - spline.plugins.users.model.OpenID, + splinext.users.model.User, + splinext.users.model.OpenID, ] def template_dirs(self): diff --git a/spline/plugins/users/controllers/__init__.py b/splinext/users/controllers/__init__.py similarity index 100% rename from spline/plugins/users/controllers/__init__.py rename to splinext/users/controllers/__init__.py diff --git a/spline/plugins/users/controllers/accounts.py b/splinext/users/controllers/accounts.py similarity index 100% rename from spline/plugins/users/controllers/accounts.py rename to splinext/users/controllers/accounts.py diff --git a/spline/plugins/users/controllers/users.py b/splinext/users/controllers/users.py similarity index 100% rename from spline/plugins/users/controllers/users.py rename to splinext/users/controllers/users.py diff --git a/spline/plugins/users/model/__init__.py b/splinext/users/model/__init__.py similarity index 100% rename from spline/plugins/users/model/__init__.py rename to splinext/users/model/__init__.py diff --git a/spline/plugins/users/templates/css/users.mako b/splinext/users/templates/css/users.mako similarity index 100% rename from spline/plugins/users/templates/css/users.mako rename to splinext/users/templates/css/users.mako diff --git a/spline/plugins/users/templates/users/lib.mako b/splinext/users/templates/users/lib.mako similarity index 100% rename from spline/plugins/users/templates/users/lib.mako rename to splinext/users/templates/users/lib.mako diff --git a/spline/plugins/users/templates/users/list.mako b/splinext/users/templates/users/list.mako similarity index 100% rename from spline/plugins/users/templates/users/list.mako rename to splinext/users/templates/users/list.mako diff --git a/spline/plugins/users/templates/users/login.mako b/splinext/users/templates/users/login.mako similarity index 100% rename from spline/plugins/users/templates/users/login.mako rename to splinext/users/templates/users/login.mako diff --git a/spline/plugins/users/templates/users/profile.mako b/splinext/users/templates/users/profile.mako similarity index 100% rename from spline/plugins/users/templates/users/profile.mako rename to splinext/users/templates/users/profile.mako diff --git a/spline/plugins/users/templates/users/profile_edit.mako b/splinext/users/templates/users/profile_edit.mako similarity index 100% rename from spline/plugins/users/templates/users/profile_edit.mako rename to splinext/users/templates/users/profile_edit.mako diff --git a/spline/plugins/users/templates/widgets/user_state.mako b/splinext/users/templates/widgets/user_state.mako similarity index 100% rename from spline/plugins/users/templates/widgets/user_state.mako rename to splinext/users/templates/widgets/user_state.mako -- 2.7.4