Merge pull request #254 from Mobeye/python3

Fix image upload when IMAGE_PATH_OBSCURIFY setting is enabled

requirements.txt

@@ -3,6 +3,6 @@ South
 Markdown>2.2.0
 django-sekizai>=0.7
 django-mptt>=0.5.3
-sorl-thumbnail
+sorl-thumbnail==11.12.1b
 Pillow
 six

wiki/plugins/images/models.py

@@ -20,9 +20,8 @@ def upload_path(instance, filename):
     upload_path = settings.IMAGE_PATH
     upload_path = upload_path.replace('%aid', str(instance.plugin.image.article.id))
     if settings.IMAGE_PATH_OBSCURIFY:
-        import random, hashlib
-        m=hashlib.md5(str(random.randint(0,100000000000000)))
-        upload_path = os.path.join(upload_path, m.hexdigest())
+        import uuid
+        upload_path = os.path.join(upload_path, uuid.uuid4().hex)
     return os.path.join(upload_path, filename)
 
 class Image(RevisionPlugin):