From b62d0eb035c9c3c3486d0841eb4a446e70158748 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 27 Jul 2011 11:44:19 -0400
Subject: removed recaptcha_django module from bundled dependencies, now need
 to get the patched django-recaptcha module published at pypi
 https://github.com/ASKBOT/django-recaptcha

---
 .gitignore                             | 1 +
 askbot/deps/django_authopenid/forms.py | 2 +-
 askbot/forms.py                        | 2 +-
 askbot/setup_templates/settings.py     | 2 +-
 askbot/startup_procedures.py           | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce223938..b63aa8c2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ askbot/skins/common/media/mathjax/
 /jinja2
 *.tar.tz
 run
+recaptcha
diff --git a/askbot/deps/django_authopenid/forms.py b/askbot/deps/django_authopenid/forms.py
index 065a2186..47323f13 100644
--- a/askbot/deps/django_authopenid/forms.py
+++ b/askbot/deps/django_authopenid/forms.py
@@ -37,7 +37,7 @@ from django.conf import settings
 from askbot.conf import settings as askbot_settings
 from askbot import const as askbot_const
 from django.utils.safestring import mark_safe
-from askbot.deps.recaptcha_django import ReCaptchaField
+from captcha.fields import ReCaptchaField
 from askbot.utils.forms import NextUrlField, UserNameField, UserEmailField, SetPasswordForm
 
 # needed for some linux distributions like debian
diff --git a/askbot/forms.py b/askbot/forms.py
index 446cbf83..70e81696 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -10,7 +10,7 @@ from django.contrib.contenttypes.models import ContentType
 from django_countries import countries
 from askbot.utils.forms import NextUrlField, UserNameField
 from askbot.utils.mail import extract_first_email_address
-from askbot.deps.recaptcha_django import ReCaptchaField
+from captcha.fields import ReCaptchaField
 from askbot.conf import settings as askbot_settings
 import logging
 
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 6f895ea4..be4e538d 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -103,7 +103,6 @@ MIDDLEWARE_CLASSES = (
     'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
     'askbot.middleware.cancel.CancelActionMiddleware',
-    'askbot.deps.recaptcha_django.middleware.ReCaptchaMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
     'askbot.middleware.view_log.ViewLogMiddleware',
@@ -165,6 +164,7 @@ INSTALLED_APPS = (
     'djcelery',
     'djkombu',
     'followit',
+    'captcha',#needs custom django-recaptcha https://github.com/ASKBOT/django-recaptcha
     #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$
     #requires setting of MEDIA_ROOT and MEDIA_URL
 )
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 63737acc..106a6d4f 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -57,7 +57,6 @@ def test_middleware():
         'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
         'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
         'askbot.middleware.cancel.CancelActionMiddleware',
-        'askbot.deps.recaptcha_django.middleware.ReCaptchaMiddleware',
         'django.middleware.transaction.TransactionMiddleware',
         'askbot.middleware.view_log.ViewLogMiddleware',
     )
-- 
cgit v1.2.3-1-g7c22