summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-07-26 20:17:30 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-07-26 20:17:30 -0400
commitded58b4b66f9a199dcc6069e2891ceafc67c3d27 (patch)
tree4e7d37535d847de95d00a279096fab5a9113e8eb
parent2ba5908f7dcc4b8396383472259ac2d85968cf4d (diff)
downloadaskbot-ded58b4b66f9a199dcc6069e2891ceafc67c3d27.tar.gz
askbot-ded58b4b66f9a199dcc6069e2891ceafc67c3d27.tar.bz2
askbot-ded58b4b66f9a199dcc6069e2891ceafc67c3d27.zip
removed recaptcha django module from the deps
-rw-r--r--askbot/deps/recaptcha_django/.svn/all-wcprops17
-rw-r--r--askbot/deps/recaptcha_django/.svn/entries52
-rw-r--r--askbot/deps/recaptcha_django/.svn/format1
-rw-r--r--askbot/deps/recaptcha_django/.svn/text-base/__init__.py.svn-base76
-rw-r--r--askbot/deps/recaptcha_django/.svn/text-base/middleware.py.svn-base12
-rw-r--r--askbot/deps/recaptcha_django/__init__.py88
-rw-r--r--askbot/deps/recaptcha_django/docs/.svn/all-wcprops11
-rw-r--r--askbot/deps/recaptcha_django/docs/.svn/entries40
-rw-r--r--askbot/deps/recaptcha_django/docs/.svn/format1
-rw-r--r--askbot/deps/recaptcha_django/docs/.svn/text-base/overview.txt.svn-base1
-rw-r--r--askbot/deps/recaptcha_django/docs/overview.txt1
-rw-r--r--askbot/deps/recaptcha_django/middleware.py12
12 files changed, 0 insertions, 312 deletions
diff --git a/askbot/deps/recaptcha_django/.svn/all-wcprops b/askbot/deps/recaptcha_django/.svn/all-wcprops
deleted file mode 100644
index 43324b46..00000000
--- a/askbot/deps/recaptcha_django/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 38
-/svn/!svn/ver/6/trunk/recaptcha_django
-END
-middleware.py
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/2/trunk/recaptcha_django/middleware.py
-END
-__init__.py
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/6/trunk/recaptcha_django/__init__.py
-END
diff --git a/askbot/deps/recaptcha_django/.svn/entries b/askbot/deps/recaptcha_django/.svn/entries
deleted file mode 100644
index 17e2d172..00000000
--- a/askbot/deps/recaptcha_django/.svn/entries
+++ /dev/null
@@ -1,52 +0,0 @@
-8
-
-dir
-6
-http://recaptcha-django.googlecode.com/svn/trunk/recaptcha_django
-http://recaptcha-django.googlecode.com/svn
-
-
-
-2009-12-12T22:16:04.511967Z
-6
-xdissent
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-af963488-c9ea-11dd-a8b6-f5aca7b582bb
-
-middleware.py
-file
-
-
-
-
-2010-06-13T21:04:19.000000Z
-3cf99bc9362dde824315288bfbfadb1a
-2008-12-14T15:07:18.967792Z
-2
-xdissent
-
-__init__.py
-file
-
-
-
-
-2010-06-13T21:04:19.000000Z
-a0c7720be84083264fcdfbf35f031062
-2009-12-12T22:16:04.511967Z
-6
-xdissent
-
diff --git a/askbot/deps/recaptcha_django/.svn/format b/askbot/deps/recaptcha_django/.svn/format
deleted file mode 100644
index 45a4fb75..00000000
--- a/askbot/deps/recaptcha_django/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/askbot/deps/recaptcha_django/.svn/text-base/__init__.py.svn-base b/askbot/deps/recaptcha_django/.svn/text-base/__init__.py.svn-base
deleted file mode 100644
index c95cbca2..00000000
--- a/askbot/deps/recaptcha_django/.svn/text-base/__init__.py.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-"""
-recaptcha-django
-
-ReCAPTCHA (Completely Automated Public Turing test to tell Computers and
-Humans Apart - while helping digitize books, newspapers, and old time radio
-shows) module for django
-"""
-
-from django.forms import Widget, Field, ValidationError
-from django.conf import settings
-from django.utils.translation import get_language, ugettext_lazy as _
-from django.utils.html import conditional_escape
-from django.utils.safestring import mark_safe
-from recaptcha.client import captcha
-
-
-HUMAN_ERRORS = {
- 'unknown': _(u'Unknown error.'),
- 'invalid-site-public-key': _(u'ReCAPTCHA is wrongly configured.'),
- 'invalid-site-private-key': _(u'ReCAPTCHA is wrongly configured.'),
- 'invalid-request-cookie': _(u'Bad reCAPTCHA challenge parameter.'),
- 'incorrect-captcha-sol': _(u'The CAPTCHA solution was incorrect.'),
- 'verify-params-incorrect': _(u'Bad reCAPTCHA verification parameters.'),
- 'invalid-referrer': _(u'Provided reCAPTCHA API keys are not valid for this domain.'),
- 'recaptcha-not-reachable': _(u'ReCAPTCHA could not be reached.')
-}
-
-
-class ReCaptchaWidget(Widget):
- """
- A Widget that renders a ReCAPTCHA form
- """
- options = ['theme', 'lang', 'custom_theme_widget', 'tabindex']
-
- def render(self, name, value, attrs=None):
- final_attrs = self.build_attrs(attrs)
- error = final_attrs.get('error', None)
- html = captcha.displayhtml(settings.RECAPTCHA_PUBLIC_KEY, error=error)
- options = u',\n'.join([u'%s: "%s"' % (k, conditional_escape(v)) \
- for k, v in final_attrs.items() if k in self.options])
- return mark_safe(u"""<script type="text/javascript">
- var RecaptchaOptions = {
- %s
- };
- </script>
- %s
- """ % (options, html))
-
-
- def value_from_datadict(self, data, files, name):
- """
- Generates Widget value from data dictionary.
- """
- try:
- return {'challenge': data['recaptcha_challenge_field'],
- 'response': data['recaptcha_response_field'],
- 'ip': data['recaptcha_ip_field']}
- except KeyError:
- return None
-
-class ReCaptchaField(Field):
- """
- Field definition for a ReCAPTCHA
- """
- widget = ReCaptchaWidget
-
- def clean(self, value):
- if value is None:
- raise ValidationError(_('Invalid request'))
- resp = captcha.submit(value.get('challenge', None),
- value.get('response', None),
- settings.RECAPTCHA_PRIVATE_KEY,
- value.get('ip', None))
- if not resp.is_valid:
- self.widget.attrs['error'] = resp.error_code
- raise ValidationError(HUMAN_ERRORS.get(resp.error_code, _(u'Unknown error.')))
diff --git a/askbot/deps/recaptcha_django/.svn/text-base/middleware.py.svn-base b/askbot/deps/recaptcha_django/.svn/text-base/middleware.py.svn-base
deleted file mode 100644
index 4d592e63..00000000
--- a/askbot/deps/recaptcha_django/.svn/text-base/middleware.py.svn-base
+++ /dev/null
@@ -1,12 +0,0 @@
-class ReCaptchaMiddleware(object):
- """
- A tiny middleware to automatically add IP address to ReCaptcha
- POST requests
- """
- def process_request(self, request):
- if request.method == 'POST' and \
- 'recaptcha_challenge_field' in request.POST and \
- 'recaptcha_ip_field' not in request.POST:
- data = request.POST.copy()
- data['recaptcha_ip_field'] = request.META['REMOTE_ADDR']
- request.POST = data
diff --git a/askbot/deps/recaptcha_django/__init__.py b/askbot/deps/recaptcha_django/__init__.py
deleted file mode 100644
index bf4c90dc..00000000
--- a/askbot/deps/recaptcha_django/__init__.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-recaptcha-django
-
-ReCAPTCHA (Completely Automated Public Turing test to tell Computers and
-Humans Apart - while helping digitize books, newspapers, and old time radio
-shows) module for django
-"""
-
-from django.forms import Widget, Field, ValidationError
-from django.conf import settings
-from django.utils.translation import get_language, ugettext_lazy as _
-from django.utils.html import conditional_escape
-from django.utils.safestring import mark_safe
-from recaptcha.client import captcha
-from askbot.conf import settings as askbot_settings
-
-
-HUMAN_ERRORS = {
- 'unknown': _(u'Unknown error.'),
- 'invalid-site-public-key': _(u'ReCAPTCHA is wrongly configured.'),
- 'invalid-site-private-key': _(u'ReCAPTCHA is wrongly configured.'),
- 'invalid-request-cookie': _(u'Bad reCAPTCHA challenge parameter.'),
- 'incorrect-captcha-sol': _(u'The CAPTCHA solution was incorrect.'),
- 'verify-params-incorrect': _(u'Bad reCAPTCHA verification parameters.'),
- 'invalid-referrer': _(u'Provided reCAPTCHA API keys are not valid for this domain.'),
- 'recaptcha-not-reachable': _(u'ReCAPTCHA could not be reached.')
-}
-
-
-class ReCaptchaWidget(Widget):
- """
- A Widget that renders a ReCAPTCHA form
- """
- options = ['theme', 'lang', 'custom_theme_widget', 'tabindex']
-
- def __init__(self, public_key = None, *args, **kwargs):
- self.public_key = public_key
- super(ReCaptchaWidget, self).__init__(*args, **kwargs)
-
- def render(self, name, value, attrs=None):
- final_attrs = self.build_attrs(attrs)
- error = final_attrs.get('error', None)
- html = captcha.displayhtml(
- self.public_key,
- error=error
- )
- options = u',\n'.join([u'%s: "%s"' % (k, conditional_escape(v)) \
- for k, v in final_attrs.items() if k in self.options])
- return mark_safe(u"""<script type="text/javascript">
- var RecaptchaOptions = {
- %s
- };
- </script>
- %s
- """ % (options, html))
-
-
- def value_from_datadict(self, data, files, name):
- """
- Generates Widget value from data dictionary.
- """
- try:
- return {'challenge': data['recaptcha_challenge_field'],
- 'response': data['recaptcha_response_field'],
- 'ip': data['recaptcha_ip_field']}
- except KeyError:
- return None
-
-class ReCaptchaField(Field):
- """
- Field definition for a ReCAPTCHA
- """
-
- def __init__(self, private_key = None, public_key = None, *args, **kwargs):
- self.widget = ReCaptchaWidget(public_key = public_key)
- self.private_key = private_key
- super(ReCaptchaField, self).__init__(*args, **kwargs)
-
- def clean(self, value):
- if value is None:
- raise ValidationError(_('Invalid request'))
- resp = captcha.submit(value.get('challenge', None),
- value.get('response', None),
- askbot_settings.RECAPTCHA_SECRET,
- value.get('ip', None))
- if not resp.is_valid:
- self.widget.attrs['error'] = resp.error_code
- raise ValidationError(HUMAN_ERRORS.get(resp.error_code, _(u'Unknown error.')))
diff --git a/askbot/deps/recaptcha_django/docs/.svn/all-wcprops b/askbot/deps/recaptcha_django/docs/.svn/all-wcprops
deleted file mode 100644
index 6ecb5451..00000000
--- a/askbot/deps/recaptcha_django/docs/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 26
-/svn/!svn/ver/2/trunk/docs
-END
-overview.txt
-K 25
-svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/2/trunk/docs/overview.txt
-END
diff --git a/askbot/deps/recaptcha_django/docs/.svn/entries b/askbot/deps/recaptcha_django/docs/.svn/entries
deleted file mode 100644
index 08b3cefa..00000000
--- a/askbot/deps/recaptcha_django/docs/.svn/entries
+++ /dev/null
@@ -1,40 +0,0 @@
-8
-
-dir
-6
-http://recaptcha-django.googlecode.com/svn/trunk/docs
-http://recaptcha-django.googlecode.com/svn
-
-
-
-2008-12-14T15:07:18.967792Z
-2
-xdissent
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-af963488-c9ea-11dd-a8b6-f5aca7b582bb
-
-overview.txt
-file
-
-
-
-
-2010-06-13T21:04:19.000000Z
-c99e6eadb3fe754f0fdfd181b80ffbe4
-2008-12-14T15:07:18.967792Z
-2
-xdissent
-
diff --git a/askbot/deps/recaptcha_django/docs/.svn/format b/askbot/deps/recaptcha_django/docs/.svn/format
deleted file mode 100644
index 45a4fb75..00000000
--- a/askbot/deps/recaptcha_django/docs/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/askbot/deps/recaptcha_django/docs/.svn/text-base/overview.txt.svn-base b/askbot/deps/recaptcha_django/docs/.svn/text-base/overview.txt.svn-base
deleted file mode 100644
index 7af69d72..00000000
--- a/askbot/deps/recaptcha_django/docs/.svn/text-base/overview.txt.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-TODO: add docs
diff --git a/askbot/deps/recaptcha_django/docs/overview.txt b/askbot/deps/recaptcha_django/docs/overview.txt
deleted file mode 100644
index 7af69d72..00000000
--- a/askbot/deps/recaptcha_django/docs/overview.txt
+++ /dev/null
@@ -1 +0,0 @@
-TODO: add docs
diff --git a/askbot/deps/recaptcha_django/middleware.py b/askbot/deps/recaptcha_django/middleware.py
deleted file mode 100644
index 4d592e63..00000000
--- a/askbot/deps/recaptcha_django/middleware.py
+++ /dev/null
@@ -1,12 +0,0 @@
-class ReCaptchaMiddleware(object):
- """
- A tiny middleware to automatically add IP address to ReCaptcha
- POST requests
- """
- def process_request(self, request):
- if request.method == 'POST' and \
- 'recaptcha_challenge_field' in request.POST and \
- 'recaptcha_ip_field' not in request.POST:
- data = request.POST.copy()
- data['recaptcha_ip_field'] = request.META['REMOTE_ADDR']
- request.POST = data