allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [2/12] git commit: [#5382] Fix imports
Date Wed, 05 Dec 2012 20:01:50 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/130a037e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/130a037e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/130a037e

Branch: refs/heads/tv/5382
Commit: 130a037e5c846e5bf84cb45d8c261c5f728d37b2
Parents: a2cb16a
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Dec 5 18:44:23 2012 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Dec 5 18:44:37 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/130a037e/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index bb8a94e..bf9e697 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