summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorGilles Dartiguelongue <gilles.dartiguelongue@esiee.org>2014-12-09 12:08:12 +0100
committerGilles Dartiguelongue <gilles.dartiguelongue@esiee.org>2015-02-23 11:37:32 +0100
commit4c34b3b01d782540e9aa1c9a3dfeb2fdc0cc2881 (patch)
tree2c3f33478546f42501c46d6dd3087314c62976cd /lib/sqlalchemy
parent305ea84004fe604f461cd3c9438fbc84e3d790b2 (diff)
downloadsqlalchemy-4c34b3b01d782540e9aa1c9a3dfeb2fdc0cc2881.tar.gz
Fix slice addressing of _AssociationList with python3
Diffstat (limited to 'lib/sqlalchemy')
-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):