[tor-commits] [bridgedb/develop] Import entire bridgedb.captcha module in bridgedb.HTTPServer.

[isis at torproject.org]

commit 4f6e5dc3ee1208a30030e0c8d7fc9ad22d0db319
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Mar 1 01:41:17 2014 +0000

    Import entire bridgedb.captcha module in bridgedb.HTTPServer.
---
 lib/bridgedb/HTTPServer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py
index 2d5fd72..63e48c9 100644
--- a/lib/bridgedb/HTTPServer.py
+++ b/lib/bridgedb/HTTPServer.py
@@ -27,7 +27,7 @@ import bridgedb.I18n as I18n
 import bridgedb.Util as Util
 
 from recaptcha.client import captcha as recaptcha
-from bridgedb.captcha import ReCaptcha
+from bridgedb import captcha
 from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4
 from bridgedb.Filters import filterBridgesByTransport
 from bridgedb.Filters import filterBridgesByNotBlockedIn
@@ -144,7 +144,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource):
         :returns: A rendered HTML page containing a ReCaptcha challenge image
                   for the client to solve.
         """
-        c = ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey)
+        c = captcha.ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey)
 
         try:
             c.get()