resolves OSQA-729, encode OpenID query dict using the django smart unicode utility...

[osqa.git] / forum / settings / base.py

diff --git a/forum/settings/base.py b/forum/settings/base.py
index 7436f46593b4e2813f292b91662ed21323a15a9b..cc706bcd49285082824b96862ed04c4c263263ee 100644 (file)
--- a/forum/settings/base.py
+++ b/forum/settings/base.py
@@ -1,5 +1,5 @@
 import django.dispatch
 import django.dispatch

-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, smart_unicode

 from datetime import datetime, timedelta
 import logging
 
 from datetime import datetime, timedelta
 import logging
 


@@ -42,7 +42,7 @@ class BaseSetting(object):
         return str(self.value)
 
     def __unicode__(self):
         return str(self.value)
 
     def __unicode__(self):

-        return unicode(self.value)
+        return smart_unicode(self.value)

 
     @property
     def value(self):
 
     @property
     def value(self):


@@ -79,7 +79,7 @@ class BaseSetting(object):
         except KeyValue.DoesNotExist:
             kv = KeyValue(key=self.name)
         except Exception, e:
         except KeyValue.DoesNotExist:
             kv = KeyValue(key=self.name)
         except Exception, e:

-            logging.error("Error savin setting to database (%s): %s" % (self.name, str(e)))
+            logging.error("Error saving setting to database (%s): %s" % (self.name, str(e)))

             return
 
         kv.value = value
             return
 
         kv.value = value


@@ -124,5 +124,3 @@ class Setting(object):
             Setting.emulators[deftype] = emul
 
         return emul(name, default, set, field_context)
             Setting.emulators[deftype] = emul
 
         return emul(name, default, set, field_context)

-
-