summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext
diff options
context:
space:
mode:
authorGilles Dartiguelongue <gilles.dartiguelongue@esiee.org>2014-12-09 12:08:12 +0100
committerMike Bayer <mike_mp@zzzcomputing.com>2015-03-10 14:28:50 -0400
commit9fee9cb87e0d13db4426664f5758c1ddad0533e3 (patch)
tree5c83504386746504d7fd38036dcbfb6d3fadb63f /lib/sqlalchemy/ext
parent6ac0555eaa6363ac9d0ad6566248dd294ad61d9e (diff)
downloadsqlalchemy-9fee9cb87e0d13db4426664f5758c1ddad0533e3.tar.gz
Fix slice addressing of _AssociationList with python3
Diffstat (limited to 'lib/sqlalchemy/ext')
-rw-r--r--lib/sqlalchemy/ext/associationproxy.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index bb08ce9ba..c0e71068b 100644
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -527,7 +527,10 @@ class _AssociationList(_AssociationCollection):
return self.setter(object, value)
def __getitem__(self, index):
- return self._get(self.col[index])
+ if not isinstance(index, slice):
+ return self._get(self.col[index])
+ else:
+ return [self._get(member) for member in self.col[index]]
def __setitem__(self, index, value):
if not isinstance(index, slice):