summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-01-24 00:21:58 +0000
committerJason Kirtland <jek@discorporate.us>2008-01-24 00:21:58 +0000
commit42a3344ebabc1a32b4c726fac00f6c4baf1d1246 (patch)
treebcb02bd062af1f33c93413901fa6660cbcb1da98 /lib
parentf6439ffa2c166edb2ffffc3042e20422f01803ee (diff)
downloadsqlalchemy-42a3344ebabc1a32b4c726fac00f6c4baf1d1246.tar.gz
A little clarity tweak to r4093
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/util.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index bdcaf37f0..1f41c1179 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -192,7 +192,7 @@ def get_cls_kwargs(cls):
for c in cls.__mro__:
if '__init__' in c.__dict__:
- stack = [c]
+ stack = Set([c])
break
else:
return []
@@ -204,9 +204,9 @@ def get_cls_kwargs(cls):
if not ctr or not isinstance(ctr, types.FunctionType):
continue
names, _, has_kw, _ = inspect.getargspec(ctr)
- args |= Set(names)
+ args.update(names)
if has_kw:
- stack.extend(class_.__bases__)
+ stack.update(class_.__bases__)
args.discard('self')
return list(args)