- Unicode, UnicodeText types now set "assert_unicode" and

      "convert_unicode" by default, but accept overriding
      **kwargs for these values.

2 files changed, 8 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index 68ac6ff89..8d83e7916 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,10 @@ CHANGES
       strings to insert after CREATE in the CREATE TABLE statement.
       [ticket:1075]
 
+    - Unicode, UnicodeText types now set "assert_unicode" and
+      "convert_unicode" by default, but accept overriding
+      **kwargs for these values.
+      
 - sqlite
     - Modified SQLite's representation of "microseconds" to 
       match the output of str(somedatetime), i.e. in that the
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index bae079e64..6b6337754 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -423,16 +423,16 @@ class Unicode(String):
     """A synonym for String(length, convert_unicode=True, assert_unicode='warn')."""
 
     def __init__(self, length=None, **kwargs):
-        kwargs['convert_unicode'] = True
-        kwargs['assert_unicode'] = 'warn'
+        kwargs.setdefault('convert_unicode', True)
+        kwargs.setdefault('assert_unicode', 'warn')
         super(Unicode, self).__init__(length=length, **kwargs)
 
 class UnicodeText(Text):
     """A synonym for Text(convert_unicode=True, assert_unicode='warn')."""
 
     def __init__(self, length=None, **kwargs):
-        kwargs['convert_unicode'] = True
-        kwargs['assert_unicode'] = 'warn'
+        kwargs.setdefault('convert_unicode', True)
+        kwargs.setdefault('assert_unicode', 'warn')
         super(UnicodeText, self).__init__(length=length, **kwargs)
 
 class Integer(TypeEngine):