diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:49:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:49:27 -0400 |
| commit | 3bf77b1b0b18b6091c96e37823bcca87237d5482 (patch) | |
| tree | 7ce0a8733694d2ebf6e696dcca68d22fad8bd62b /lib/sqlalchemy/dialects/postgresql/hstore.py | |
| parent | 9c746c44a314d357b855108b6e99b773ce52f760 (diff) | |
| parent | be2c145a84df5db0233f84995765d3f614776f75 (diff) | |
| download | sqlalchemy-3bf77b1b0b18b6091c96e37823bcca87237d5482.tar.gz | |
Merge branch 'rel_0_9'
Conflicts:
lib/sqlalchemy/dialects/postgresql/hstore.py
lib/sqlalchemy/util/__init__.py
lib/sqlalchemy/util/compat.py
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/hstore.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/hstore.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/hstore.py b/lib/sqlalchemy/dialects/postgresql/hstore.py index 4daf54bab..d7368ff42 100644 --- a/lib/sqlalchemy/dialects/postgresql/hstore.py +++ b/lib/sqlalchemy/dialects/postgresql/hstore.py @@ -97,14 +97,14 @@ def _serialize_hstore(val): def esc(s, position): if position == 'value' and s is None: return 'NULL' - elif isinstance(s, basestring): + elif isinstance(s, util.string_types): return '"%s"' % s.replace('"', r'\"') else: raise ValueError("%r in %s position is not a string." % (s, position)) return ', '.join('%s=>%s' % (esc(k, 'key'), esc(v, 'value')) - for k, v in val.iteritems()) + for k, v in val.items()) class HSTORE(sqltypes.Concatenable, sqltypes.TypeEngine): |