Merge branch 'master' of github.com:ella/django-markup

Author: whit

djangomarkup/fields.py

@@ -11,7 +11,7 @@
 from django.contrib.contenttypes.models import ContentType
 from djangomarkup.models import SourceText, TextProcessor
 from djangomarkup.widgets import RichTextAreaWidget
-from djangomarkup.processors import ProcessorConfigurationError, ProcessorError
+from djangomarkup.processors import ProcessorError
 
 RICH_FIELDS_SET = '__rich_fields_list'
 SRC_TEXT_ATTR = '__src_text'
@@ -22,14 +22,18 @@ class UnicodeWrapper(unicode):
     def __str__(self):
         return smart_str(self)
 
-if settings.DATABASE_ENGINE == 'postgresql_psycopg2':
     def __conform__(self, x):
-        # hack to enable psycopg2's adapting to work
-        # on something that is not a unicode
-        from psycopg2.extensions import adapt
-        return adapt(unicode(self))
-    UnicodeWrapper.__conform__ = __conform__
-
+            try:
+                engine = settings.DATABASES['default']['ENGINE'].split('.')[-1]
+            except (KeyError, AttributeError):
+                engine = getattr(settings, 'DATABASE_ENGINE', '').split('.')[-1]
+
+            if engine.startswith('postgresql'):
+                # hack to enable psycopg2's adapting to work
+                # on something that is not a unicode
+                from psycopg2.extensions import adapt
+                return adapt(unicode(self))
+            return unicode(self)
 
 def post_save_listener(sender, instance, src_text_attr=SRC_TEXT_ATTR, **kwargs):
     src_texts = []

djangomarkup/models.py

@@ -52,7 +52,7 @@ def get_function(self):
     def convert(self, src_txt):
         function = self.get_function()
         try:
-            return function(src_txt)
+            return unicode(function(src_txt))
         except Exception, err:
             raise ProcessorError(err)