diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-02 00:06:53 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-02 00:06:53 +0000 |
| commit | 2391e6d67a87f923063f6bdb61097a9f015031fd (patch) | |
| tree | 61904f44d8112854567ae981b7cd0d039b0d86d5 /lib/sqlalchemy | |
| parent | fd8d4a45ea1c2087ed3c4a86bf5f889b194fdb48 (diff) | |
| download | sqlalchemy-2391e6d67a87f923063f6bdb61097a9f015031fd.tar.gz | |
got unicode to do None...
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/types.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py index 70d124ec8..fcd416398 100644 --- a/lib/sqlalchemy/types.py +++ b/lib/sqlalchemy/types.py @@ -95,12 +95,12 @@ class String(NullTypeEngine): else: return self def convert_bind_param(self, value, engine): - if not engine.convert_unicode or not isinstance(value, unicode): + if not engine.convert_unicode or value is None or not isinstance(value, unicode): return value else: return value.encode('utf-8') def convert_result_value(self, value, engine): - if not engine.convert_unicode or isinstance(value, unicode): + if not engine.convert_unicode or value is None or isinstance(value, unicode): return value else: return value.decode('utf-8') |