From 7a171f471c2d4e37923c4ef750ddf353a1054393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 4 Apr 2016 15:40:46 +0200 Subject: [PATCH] Renamed package 'manage' to 'manage_extra' There already is a Flask-default 'manage.py', and with a subdir 'manage' in the same directory, 'import manage' is ambiguous. --- pillar/application/modules/projects.py | 8 ++++---- pillar/manage.py | 18 +++++++++--------- pillar/{manage => manage_extra}/__init__.py | 0 pillar/{manage => manage_extra}/import_data.py | 0 .../node_types/__init__.py | 0 .../{manage => manage_extra}/node_types/act.py | 0 .../node_types/asset.py | 2 +- .../node_types/blog.py | 0 .../node_types/comment.py | 0 .../node_types/group.py | 0 .../node_types/group_texture.py | 0 .../node_types/page.py | 2 +- .../node_types/post.py | 2 +- .../node_types/project.py | 2 +- .../node_types/scene.py | 0 .../node_types/shot.py | 0 .../node_types/storage.py | 0 .../node_types/task.py | 0 .../node_types/texture.py | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename pillar/{manage => manage_extra}/__init__.py (100%) rename pillar/{manage => manage_extra}/import_data.py (100%) rename pillar/{manage => manage_extra}/node_types/__init__.py (100%) rename pillar/{manage => manage_extra}/node_types/act.py (100%) rename pillar/{manage => manage_extra}/node_types/asset.py (97%) rename pillar/{manage => manage_extra}/node_types/blog.py (100%) rename pillar/{manage => manage_extra}/node_types/comment.py (100%) rename pillar/{manage => manage_extra}/node_types/group.py (100%) rename pillar/{manage => manage_extra}/node_types/group_texture.py (100%) rename pillar/{manage => manage_extra}/node_types/page.py (96%) rename pillar/{manage => manage_extra}/node_types/post.py (96%) rename pillar/{manage => manage_extra}/node_types/project.py (98%) rename pillar/{manage => manage_extra}/node_types/scene.py (100%) rename pillar/{manage => manage_extra}/node_types/shot.py (100%) rename pillar/{manage => manage_extra}/node_types/storage.py (100%) rename pillar/{manage => manage_extra}/node_types/task.py (100%) rename pillar/{manage => manage_extra}/node_types/texture.py (97%) diff --git a/pillar/application/modules/projects.py b/pillar/application/modules/projects.py index aca04843..3c74be21 100644 --- a/pillar/application/modules/projects.py +++ b/pillar/application/modules/projects.py @@ -6,10 +6,10 @@ from eve.methods.post import post_internal from application import app from application.utils import remove_private_keys from application.utils.gcs import GoogleCloudStorageBucket -from manage.node_types.asset import node_type_asset -from manage.node_types.group import node_type_group -from manage.node_types.page import node_type_page -from manage.node_types.comment import node_type_comment +from manage_extra.node_types.asset import node_type_asset +from manage_extra.node_types.group import node_type_group +from manage_extra.node_types.page import node_type_page +from manage_extra.node_types.comment import node_type_comment log = logging.getLogger(__name__) diff --git a/pillar/manage.py b/pillar/manage.py index b7d7c6dc..e6e5869b 100755 --- a/pillar/manage.py +++ b/pillar/manage.py @@ -15,15 +15,15 @@ if not os.environ.get('EVE_SETTINGS'): from application import app from application.utils.gcs import GoogleCloudStorageBucket -from manage.node_types.asset import node_type_asset -from manage.node_types.blog import node_type_blog -from manage.node_types.comment import node_type_comment -from manage.node_types.group import node_type_group -from manage.node_types.post import node_type_post -from manage.node_types.project import node_type_project -from manage.node_types.storage import node_type_storage -from manage.node_types.texture import node_type_texture -from manage.node_types.group_texture import node_type_group_texture +from manage_extra.node_types.asset import node_type_asset +from manage_extra.node_types.blog import node_type_blog +from manage_extra.node_types.comment import node_type_comment +from manage_extra.node_types.group import node_type_group +from manage_extra.node_types.post import node_type_post +from manage_extra.node_types.project import node_type_project +from manage_extra.node_types.storage import node_type_storage +from manage_extra.node_types.texture import node_type_texture +from manage_extra.node_types.group_texture import node_type_group_texture manager = Manager(app) diff --git a/pillar/manage/__init__.py b/pillar/manage_extra/__init__.py similarity index 100% rename from pillar/manage/__init__.py rename to pillar/manage_extra/__init__.py diff --git a/pillar/manage/import_data.py b/pillar/manage_extra/import_data.py similarity index 100% rename from pillar/manage/import_data.py rename to pillar/manage_extra/import_data.py diff --git a/pillar/manage/node_types/__init__.py b/pillar/manage_extra/node_types/__init__.py similarity index 100% rename from pillar/manage/node_types/__init__.py rename to pillar/manage_extra/node_types/__init__.py diff --git a/pillar/manage/node_types/act.py b/pillar/manage_extra/node_types/act.py similarity index 100% rename from pillar/manage/node_types/act.py rename to pillar/manage_extra/node_types/act.py diff --git a/pillar/manage/node_types/asset.py b/pillar/manage_extra/node_types/asset.py similarity index 97% rename from pillar/manage/node_types/asset.py rename to pillar/manage_extra/node_types/asset.py index 9aab4882..37a8a1b1 100644 --- a/pillar/manage/node_types/asset.py +++ b/pillar/manage_extra/node_types/asset.py @@ -1,4 +1,4 @@ -from manage.node_types import _file_embedded_schema +from manage_extra.node_types import _file_embedded_schema node_type_asset = { 'name': 'asset', diff --git a/pillar/manage/node_types/blog.py b/pillar/manage_extra/node_types/blog.py similarity index 100% rename from pillar/manage/node_types/blog.py rename to pillar/manage_extra/node_types/blog.py diff --git a/pillar/manage/node_types/comment.py b/pillar/manage_extra/node_types/comment.py similarity index 100% rename from pillar/manage/node_types/comment.py rename to pillar/manage_extra/node_types/comment.py diff --git a/pillar/manage/node_types/group.py b/pillar/manage_extra/node_types/group.py similarity index 100% rename from pillar/manage/node_types/group.py rename to pillar/manage_extra/node_types/group.py diff --git a/pillar/manage/node_types/group_texture.py b/pillar/manage_extra/node_types/group_texture.py similarity index 100% rename from pillar/manage/node_types/group_texture.py rename to pillar/manage_extra/node_types/group_texture.py diff --git a/pillar/manage/node_types/page.py b/pillar/manage_extra/node_types/page.py similarity index 96% rename from pillar/manage/node_types/page.py rename to pillar/manage_extra/node_types/page.py index a650860c..30b498ed 100644 --- a/pillar/manage/node_types/page.py +++ b/pillar/manage_extra/node_types/page.py @@ -1,4 +1,4 @@ -from manage.node_types import _file_embedded_schema +from manage_extra.node_types import _file_embedded_schema node_type_page = { 'name': 'page', diff --git a/pillar/manage/node_types/post.py b/pillar/manage_extra/node_types/post.py similarity index 96% rename from pillar/manage/node_types/post.py rename to pillar/manage_extra/node_types/post.py index ebc687f0..c6e9e9b6 100644 --- a/pillar/manage/node_types/post.py +++ b/pillar/manage_extra/node_types/post.py @@ -1,4 +1,4 @@ -from manage.node_types import _file_embedded_schema +from manage_extra.node_types import _file_embedded_schema node_type_post = { 'name': 'post', diff --git a/pillar/manage/node_types/project.py b/pillar/manage_extra/node_types/project.py similarity index 98% rename from pillar/manage/node_types/project.py rename to pillar/manage_extra/node_types/project.py index 24a6520f..668bc553 100644 --- a/pillar/manage/node_types/project.py +++ b/pillar/manage_extra/node_types/project.py @@ -1,4 +1,4 @@ -from manage.node_types import _file_embedded_schema +from manage_extra.node_types import _file_embedded_schema node_type_project = { 'name': 'project', diff --git a/pillar/manage/node_types/scene.py b/pillar/manage_extra/node_types/scene.py similarity index 100% rename from pillar/manage/node_types/scene.py rename to pillar/manage_extra/node_types/scene.py diff --git a/pillar/manage/node_types/shot.py b/pillar/manage_extra/node_types/shot.py similarity index 100% rename from pillar/manage/node_types/shot.py rename to pillar/manage_extra/node_types/shot.py diff --git a/pillar/manage/node_types/storage.py b/pillar/manage_extra/node_types/storage.py similarity index 100% rename from pillar/manage/node_types/storage.py rename to pillar/manage_extra/node_types/storage.py diff --git a/pillar/manage/node_types/task.py b/pillar/manage_extra/node_types/task.py similarity index 100% rename from pillar/manage/node_types/task.py rename to pillar/manage_extra/node_types/task.py diff --git a/pillar/manage/node_types/texture.py b/pillar/manage_extra/node_types/texture.py similarity index 97% rename from pillar/manage/node_types/texture.py rename to pillar/manage_extra/node_types/texture.py index 5c7df999..07cd95a2 100644 --- a/pillar/manage/node_types/texture.py +++ b/pillar/manage_extra/node_types/texture.py @@ -1,4 +1,4 @@ -from manage.node_types import _file_embedded_schema +from manage_extra.node_types import _file_embedded_schema node_type_texture = { 'name': 'texture',