Merge pull request #5 from lra/french

[osqa.git] / forum / forms / general.py

diff --git a/forum/forms/general.py b/forum/forms/general.py
index 01c528bb854a7295e05e6ad6cd0523d6150358af..06ee23c0d9ff423fe1dd80dccb254f39ce0a28f9 100644 (file)
--- a/forum/forms/general.py
+++ b/forum/forms/general.py
@@ -3,7 +3,6 @@ import re
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from forum import settings
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from forum import settings

-from django.http import str_to_unicode

 from forum.models import User
 from forum.modules import call_all_handlers
 import urllib
 from forum.models import User
 from forum.modules import call_all_handlers
 import urllib


@@ -13,7 +12,9 @@ DEFAULT_NEXT = getattr(settings, 'APP_BASE_URL')
 def clean_next(next):
     if next is None:
         return DEFAULT_NEXT
 def clean_next(next):
     if next is None:
         return DEFAULT_NEXT

-    next = str_to_unicode(urllib.unquote(next), 'utf-8')
+    next = urllib.unquote(next)
+    if not isinstance(next, unicode):
+        next = unicode(next, 'utf-8')

     next = next.strip()
     if next.startswith('/'):
         return next
     next = next.strip()
     if next.startswith('/'):
         return next