fixes

euscanwww/djeuscan/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns, include
+from django.conf.urls import url, patterns, include
 from django.contrib.auth.decorators import user_passes_test
 
 from djcelery.views import apply as apply_task

euscanwww/euscan_captcha/__init__.py

@@ -1,6 +1,6 @@
-from registration.backends.default import DefaultBackend
+#from registration.backends.default import DefaultBackend
-from forms import RegistrationFormCaptcha
+#from forms import RegistrationFormCaptcha
-
+#
-class CaptchaDefaultBackend(DefaultBackend):
+#class CaptchaDefaultBackend(DefaultBackend):
-    def get_form_class(self, request):
+#    def get_form_class(self, request):
-        return RegistrationFormCaptcha
+#        return RegistrationFormCaptcha

euscanwww/euscan_captcha/forms.py

@@ -1,8 +1,9 @@
-from captcha.fields import ReCaptchaField
-from registration.forms import RegistrationForm
 from django.conf import settings
 
-class RegistrationFormCaptcha(RegistrationForm):
+from captcha.fields import ReCaptchaField
+from registration.forms import RegistrationForm
+
+class RecaptchaRegistrationForm(RegistrationForm):
     captcha = ReCaptchaField(
         public_key=settings.RECAPTCHA_PUBLIC_KEY,
         private_key=settings.RECAPTCHA_PRIVATE_KEY,

euscanwww/euscan_captcha/urls.py

@@ -1,12 +1,10 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
-from registration.views import register
+from views import RecaptchaRegistrationView
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
-    url(
+    '', url(
         r'^register/$',
-        register,
+        RecaptchaRegistrationView.as_view(),
-        {'backend': 'euscanwww.captcha.CaptchaDefaultBackend'},
+        name='registration_register'),
-        name='registration_register'
-    ),
 )