Merge 1152e82 into c0aee3d

README.rst

@@ -12,9 +12,9 @@ django-inspectional-registration
     :target: https://requires.io/github/lambdalisue/django-inspectional-registration/requirements/?branch=master
     :alt: Requirements Status
 
-.. image:: https://landscape.io/github/lambdalisue/django-inspectional-registration/master/landscape.png
-    :target: https://landscape.io/github/lambdalisue/django-inspectional-registration/master
-    :alt: Code Health
+.. image:: https://landscape.io/github/lambdalisue/django-inspectional-registration/master/landscape.svg?style=flat
+   :target: https://landscape.io/github/lambdalisue/django-inspectional-registration/master
+   :alt: Code Health
 
 .. image:: https://scrutinizer-ci.com/g/lambdalisue/django-inspectional-registration/badges/quality-score.png?b=master
     :target: https://scrutinizer-ci.com/g/lambdalisue/django-inspectional-registration/inspections

docs/about_registration_supplement.rst

@@ -21,7 +21,9 @@ Quick tutorial to create your own Registration Supplement
 
 2.  Create new registration supplement model in your ``models.py`` as::
 
+        from __future__ import unicode_literals
         from django.db import models
+        from django.utils.encoding import python_2_unicode_compatible
         from registration.supplements import RegistrationSupplementBase
 
         class MyRegistrationSupplement(RegistrationSupplementBase):
@@ -30,7 +32,7 @@ Quick tutorial to create your own Registration Supplement
             age = models.IntegerField("Age")
             remarks = models.TextField("Remarks", blank=True)
 
-            def __unicode__(self):
+            def __str__(self):
                 # a summary of this supplement
                 return "%s (%s)" % (self.realname, self.age)
 

docs/conf.py

@@ -19,6 +19,10 @@
 sys.path.insert(0, os.path.join(BASE_DIR, 'tests'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
+import django
+if django.VERSION >= (1, 7):
+    django.setup()
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

docs/registration.migrations.rst

@@ -12,30 +12,6 @@ registration.migrations.0001_initial module
     :undoc-members:
     :show-inheritance:
 
-registration.migrations.0002_auto__add_field_registrationprofile__status__chg_field_registrationpro module
-----------------------------------------------------------------------------------------------------------
-
-.. automodule:: registration.migrations.0002_auto__add_field_registrationprofile__status__chg_field_registrationpro
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-registration.migrations.0003_status module
-------------------------------------------
-
-.. automodule:: registration.migrations.0003_status
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-registration.migrations.0004_activation_keys module
----------------------------------------------------
-
-.. automodule:: registration.migrations.0004_activation_keys
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 Module contents
 ---------------

docs/registration.rst

@@ -11,6 +11,7 @@ Subpackages
     registration.contrib
     registration.management
     registration.migrations
+    registration.south_migrations
     registration.supplements
     registration.tests
 

docs/registration.south_migrations.rst

@@ -0,0 +1,46 @@
+registration.south_migrations package
+=====================================
+
+Submodules
+----------
+
+registration.south_migrations.0001_initial module
+-------------------------------------------------
+
+.. automodule:: registration.south_migrations.0001_initial
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+registration.south_migrations.0002_auto__add_field_registrationprofile__status__chg_field_registrationpro module
+----------------------------------------------------------------------------------------------------------------
+
+.. automodule:: registration.south_migrations.0002_auto__add_field_registrationprofile__status__chg_field_registrationpro
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+registration.south_migrations.0003_status module
+------------------------------------------------
+
+.. automodule:: registration.south_migrations.0003_status
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+registration.south_migrations.0004_activation_keys module
+---------------------------------------------------------
+
+.. automodule:: registration.south_migrations.0004_activation_keys
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: registration.south_migrations
+    :members:
+    :undoc-members:
+    :show-inheritance:

manage.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Django 1.2 - 1.6 compatible manage.py
 Modify this script to make your own manage.py

src/registration/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 from app_version import get_versions
 __version__, VERSION = get_versions('django-inspectional-registration',
                                     allow_ambiguous=True)

src/registration/admin/__init__.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Admins of django-inspectional-registration
 
@@ -55,14 +56,14 @@
 from django.utils.safestring import mark_safe
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import force_text
 
 from registration.conf import settings
 from registration.backends import get_backend
 from registration.models import RegistrationProfile
 from registration.utils import get_site
 from registration.admin.forms import RegistrationAdminForm
 from registration.compat import import_module
-from registration.compat import force_unicode
 from registration.compat import transaction_atomic
 from registration.compat import unquote
 
@@ -87,7 +88,7 @@ def get_supplement_admin_inline_base_class(path=None):
     module, attr = path[:i], path[i+1:]
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured((
             'Error loading admin inline class for registration supplement '
             '%s: "%s"'
@@ -306,7 +307,7 @@ def display_supplement_summary(self, obj):
 
         """
         if obj.supplement:
-            return force_unicode(obj.supplement)
+            return force_text(obj.supplement)
         return _('Not available')
     display_supplement_summary.short_description = _(
         'A summary of supplemental information'
@@ -329,7 +330,7 @@ def display_activation_key(self, obj):
             activation_url = reverse('registration_activate',
                                      kwargs={
                                          'activation_key': obj.activation_key})
-            return mark_safe(u'<a href="%s">%s</a>' % (
+            return mark_safe('<a href="%s">%s</a>' % (
                 activation_url, obj.activation_key))
         return _('Not available')
     display_activation_key.short_description = _('Activation key')

src/registration/admin/forms.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 A forms used in RegistrationAdmin
 """

src/registration/backends/__init__.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Backend
 
@@ -64,7 +65,7 @@ def get_backend_class(path=None):
     module, attr = path[:i], path[i+1:]
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured(
                 'Error loading registration backend %s: "%s"' % (module, e))
     try:

src/registration/backends/base.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Base class of registration backend
 

src/registration/backends/default/__init__.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Default registration backend class
 

src/registration/compat.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Compatibility module
 """
@@ -39,12 +40,6 @@
 except ImportError:
     from django.utils.hashcompat import sha_constructor as sha1
 
-try:
-    # only available in python 2
-    from django.utils.encoding import force_unicode
-except ImportError:
-    from django.utils.encoding import force_text as force_unicode
-
 #
 # Django change the transaction strategy from Django 1.6
 # https://docs.djangoproject.com/en/1.6/topics/db/transactions/

src/registration/conf.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Confiurations of django-inspectional-registration
 """

src/registration/contrib/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Contributions of django-inspectional-registration
 

src/registration/contrib/autologin/__init__.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Automatically log activated user in when they have activated with their activation
 link. This doesn't happen when the user was activated programatically with Django

src/registration/contrib/autologin/conf.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 """
 __author__ = 'Alisue <lambdalisue@hashnote.net>'

src/registration/contrib/autologin/tests.py

@@ -1,4 +1,5 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 """
 __author__ = 'Alisue <lambdalisue@hashnote.net>'

src/registration/contrib/notification/__init__.py

@@ -1,4 +1,5 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Send notification emails to admins, managers or particular recipients 
 when new user has registered in the site

src/registration/contrib/notification/conf.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 """
 __author__ = 'Alisue <lambdalisue@hashnote.net>'

src/registration/contrib/notification/tests/__init__.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 """
 __author__ = 'Alisue <lambdalisue@hashnote.net>'

src/registration/contrib/notification/tests/urls.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 from registration.compat import url
 from registration.compat import patterns
 from registration.compat import include

src/registration/forms.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 Forms of django-inspectional-registration
 
@@ -143,8 +144,8 @@ class RegistrationFormTermsOfService(RegistrationForm):
 
     """
     tos = forms.BooleanField(widget=forms.CheckboxInput(attrs=attrs_dict),
-                             label=_(u'I have read and agree to the Terms '
-                                     u'of Service'),
+                             label=_('I have read and agree to the Terms '
+                                     'of Service'),
                              error_messages={'required': _(
                                  "You must agree to the terms to register")})
 

src/registration/management/commands/cleanup_expired_registrations.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 A management command which deletes expired or rejected accounts (e.g.,
 accounts which signed up but never activated) from the database.

src/registration/management/commands/cleanup_registrations.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 A management command which deletes expired or rejected accounts (e.g.,
 accounts which signed up but never activated) from the database.

src/registration/management/commands/cleanup_rejected_registrations.py

@@ -1,4 +1,5 @@
-# coding=utf-8
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 """
 A management command which deletes expired or rejected accounts (e.g.,
 accounts which signed up but never activated) from the database.

src/registration/management/commands/cleanupregistration.py

@@ -1,2 +1,4 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 # This is for compatibility to django-registration
-from cleanup_registrations import *
+from registration.management.commands.cleanup_registrations import *