diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-06-15 22:23:08 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-06-15 22:23:08 +0000 |
| commit | 964fac813c205a5f8656f8cbe2bb77815e5f3556 (patch) | |
| tree | a9f3de8e728e73ff356b2ee4f003f27df6a7dc11 /lib/sqlalchemy | |
| parent | 44b6977cf4eab8e91ac617efd9bc37dbf86101b4 (diff) | |
| download | sqlalchemy-964fac813c205a5f8656f8cbe2bb77815e5f3556.tar.gz | |
- Fixed bug whereby list-based attributes, like pickletype
and PGArray, failed to be merged() properly.
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 92500758f..6894b8f85 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -111,8 +111,6 @@ class InstanceState(object): return None elif hasattr(impl, 'get_collection'): return impl.get_collection(self, dict_, x, passive=passive) - elif isinstance(x, list): - return x else: return [x] |