diff options
| author | Jason Kirtland <jek@discorporate.us> | 2008-01-24 01:12:46 +0000 |
|---|---|---|
| committer | Jason Kirtland <jek@discorporate.us> | 2008-01-24 01:12:46 +0000 |
| commit | ed740839564502a04fe8b2d07b2232d0d7383323 (patch) | |
| tree | a5a2b4d03cd99d4b61e8a2336de729d8b273a074 /lib/sqlalchemy/ext/associationproxy.py | |
| parent | e94c3ba27a5e07d1c77fed36bf6fcd3c44848118 (diff) | |
| download | sqlalchemy-ed740839564502a04fe8b2d07b2232d0d7383323.tar.gz | |
- Flipped join order of __radd__ on association proxied lists.
Diffstat (limited to 'lib/sqlalchemy/ext/associationproxy.py')
| -rw-r--r-- | lib/sqlalchemy/ext/associationproxy.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py index e9f604005..1e237a857 100644 --- a/lib/sqlalchemy/ext/associationproxy.py +++ b/lib/sqlalchemy/ext/associationproxy.py @@ -408,7 +408,13 @@ class _AssociationList(object): except TypeError: return NotImplemented return list(self) + other - __radd__ = __add__ + + def __radd__(self, iterable): + try: + other = list(iterable) + except TypeError: + return NotImplemented + return other + list(self) def __mul__(self, n): if not isinstance(n, int): |