incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [2/3] git commit: [#5382] Fix imports
Date Tue, 11 Dec 2012 21:44:01 GMT
[#5382] Fix imports


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

Branch: refs/heads/master
Commit: 00b6c793bbc31bccfa3ecdb82a4b80a05d8d4d81
Parents: d4c9a4e
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Dec 5 18:44:23 2012 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Tue Dec 11 21:43:25 2012 +0000

----------------------------------------------------------------------
 Allura/allura/lib/app_globals.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/00b6c793/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 8ae87f3..09f5bd9 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -33,7 +33,6 @@ from allura.lib.markdown_extensions import ForgeExtension
 
 from allura.lib import gravatar, plugin, utils
 from allura.lib import helpers as h
-from allura.lib import spam
 from allura.lib.widgets import analytics
 from allura.lib.security import Credentials
 from allura.lib.async import Connection, MockAMQ
@@ -177,9 +176,11 @@ class Globals(object):
         """
         akismet_key = config.get('spam.akismet_key')
         if akismet_key:
-            checker = spam.akismetservice.Akismet(akismet_key, config.get('base_url'))
+            from allura.lib.spam import akismetservice
+            checker = akismetservice.Akismet(akismet_key, config.get('base_url'))
             checker.verify_key()
         else:
+            from allura.lib import spam
             checker = spam.FakeSpamChecker()
         return checker
 


Mime
View raw message