diff options
| author | Jason Kirtland <jek@discorporate.us> | 2008-01-19 23:37:11 +0000 |
|---|---|---|
| committer | Jason Kirtland <jek@discorporate.us> | 2008-01-19 23:37:11 +0000 |
| commit | 4be99db15b7a62b37493c86da07bcc787f44a7df (patch) | |
| tree | b9d71342f22e307a08c38487d63c795039f10b96 /lib/sqlalchemy | |
| parent | 21193cebe22f44982cb70ecd64743df63494b17d (diff) | |
| download | sqlalchemy-4be99db15b7a62b37493c86da07bcc787f44a7df.tar.gz | |
- Restored 2.3 compat. in lib/sqlalchemy
- Part one of test suite fixes to run on 2.3
Lots of failures still around sets; sets.Set differs from __builtin__.set
particularly in the binops. We depend on set extensively now and may need to
provide a corrected sets.Set subclass on 2.3.
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/dependency.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py index c28598542..f675aff50 100644 --- a/lib/sqlalchemy/orm/dependency.py +++ b/lib/sqlalchemy/orm/dependency.py @@ -282,7 +282,7 @@ class DetectKeySwitch(DependencyProcessor): self._process_key_switches(deplist, uowcommit) def _process_key_switches(self, deplist, uowcommit): - switchers = util.Set(s for s in deplist if self._pks_changed(uowcommit, s)) + switchers = util.Set([s for s in deplist if self._pks_changed(uowcommit, s)]) if switchers: # yes, we're doing a linear search right now through the UOW. only # takes effect when primary key values have actually changed. diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index ab31b328b..201d0e2e3 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -880,7 +880,7 @@ class Query(object): if tuples: rows = util.OrderedSet() for row in fetch: - rows.add(tuple(proc(context, row) for proc in process)) + rows.add(tuple([proc(context, row) for proc in process])) else: rows = util.UniqueAppender([]) for row in fetch: |