Anonymous avatar Anonymous committed 748a11d

fixes so default registration works under python 3.3

Comments (0)

Files changed (3)

 MANIFEST
 _build
 _static
-django_registration.egg-info
-django_registration_friendly.egg-info
+django_reg.egg-info

registration/__init__.py

-VERSION = (1, 0, 0, 'final', 0)
+VERSION = (1, 0, 1, 'final', 0)
 
 
 def get_version():

registration/models.py

 import hashlib
 import random
 import re
+import sys
 
 from django.conf import settings
 from django.db import models
         username and a random salt.
         
         """
-        salt = hashlib.sha1(str(random.random())).hexdigest()[:5]
-        username = user.username
-        if isinstance(username, unicode):
-            username = username.encode('utf-8')
-        activation_key = hashlib.sha1(salt+username).hexdigest()
+        # handle the encoding
+        # TODO - This is hacky but I needed it to work. FIXME later: pydanny 6/28/2013
+        if sys.version.startswith('2'):
+            salt = hashlib.sha1(str(random.random())).hexdigest()[:5]
+            username = user.username
+            if isinstance(username, unicode):
+                username = username.encode('utf-8')
+            activation_key = hashlib.sha1(salt+username).hexdigest()
+        else:
+            salt = hashlib.sha1(str(random.random()).encode("utf-8")).hexdigest()[:5].encode("utf-8")
+            username = user.username.encode("utf-8")
+            key = salt+username
+            activation_key = hashlib.sha1(key).hexdigest()
         return self.create(user=user,
                            activation_key=activation_key)
         
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.