You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/09/09 16:02:41 UTC

[6/6] git commit: [#6533] Minor refactoring

[#6533] Minor refactoring

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/781e22bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/781e22bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/781e22bd

Branch: refs/heads/master
Commit: 781e22bd5f7ff77431690531ba13e93a27279094
Parents: 3eb0263
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Sep 9 14:01:30 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Sep 9 14:02:09 2013 +0000

----------------------------------------------------------------------
 ForgeImporters/forgeimporters/github/code.py | 50 ++++++++---------------
 1 file changed, 18 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/781e22bd/ForgeImporters/forgeimporters/github/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/code.py b/ForgeImporters/forgeimporters/github/code.py
index 9035472..92e5626 100644
--- a/ForgeImporters/forgeimporters/github/code.py
+++ b/ForgeImporters/forgeimporters/github/code.py
@@ -15,16 +15,9 @@
 #       specific language governing permissions and limitations
 #       under the License.
 
-import formencode as fe
-
+from pylons import tmpl_context as c
 from pylons import app_globals as g
 from formencode import validators as fev
-
-from allura.controllers import BaseController
-from allura.lib import validators as v
-from forgeimporters.base import ToolImporter
-from forgeimporters.github import GitHubProjectExtractor
-
 from tg import (
         expose,
         flash,
@@ -35,36 +28,30 @@ from tg.decorators import (
         with_trailing_slash,
         without_trailing_slash,
         )
+
 from allura.lib.decorators import require_post, task
-from pylons import tmpl_context as c
+from allura.controllers import BaseController
 
-TARGET_APPS = []
+from forgegit.git_main import ForgeGitApp
+
+from forgeimporters.base import (
+        ToolImporter,
+        ToolImportForm,
+        ImportErrorHandler,
+        )
+from forgeimporters.github import GitHubProjectExtractor
 
-try:
-    from forgegit.git_main import ForgeGitApp
-    TARGET_APPS.append(ForgeGitApp)
-except ImportError:
-    pass
 
 @task(notifications_disabled=True)
 def import_tool(**kw):
-    GitHubRepoImporter().import_tool(c.project, c.user, **kw)
+    importer = GitHubRepoImporter()
+    with ImportErrorHandler(importer, kw.get('project_name')):
+        importer.import_tool(c.project, c.user, **kw)
 
 
-class GitHubRepoImportForm(fe.schema.Schema):
+class GitHubRepoImportForm(ToolImportForm):
     gh_project_name = fev.UnicodeString(not_empty=True)
     gh_user_name = fev.UnicodeString(not_empty=True)
-    mount_point = fev.UnicodeString()
-    mount_label = fev.UnicodeString()
-
-    def _to_python(self, value, state):
-        value = super(self.__class__, self)._to_python(value, state)
-        mount_point = value['mount_point']
-        try:
-            v.MountPointValidator(ForgeGitApp).to_python(mount_point)
-        except fe.Invalid as e:
-            raise fe.Invalid('mount_point:' + str(e), value, state)
-        return value
 
 
 class GitHubRepoImportController(BaseController):
@@ -73,7 +60,7 @@ class GitHubRepoImportController(BaseController):
 
     @property
     def target_app(self):
-        return self.importer.target_app[0]
+        return self.importer.target_app
 
     @with_trailing_slash
     @expose('jinja:forgeimporters.github:templates/code/index.html')
@@ -84,7 +71,7 @@ class GitHubRepoImportController(BaseController):
     @without_trailing_slash
     @expose()
     @require_post()
-    @validate(GitHubRepoImportForm(), error_handler=index)
+    @validate(GitHubRepoImportForm(ForgeGitApp), error_handler=index)
     def create(self, gh_project_name, gh_user_name, mount_point, mount_label, **kw):
         import_tool.post(
                 project_name=gh_project_name,
@@ -96,9 +83,8 @@ class GitHubRepoImportController(BaseController):
         redirect(c.project.url() + 'admin/')
 
 
-
 class GitHubRepoImporter(ToolImporter):
-    target_app = TARGET_APPS
+    target_app = ForgeGitApp
     source = 'GitHub'
     controller = GitHubRepoImportController
     tool_label = 'Source Code'