summaryrefslogtreecommitdiff
path: root/test/ext/declarative
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 13:09:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 13:09:05 -0400
commit00f2b19a5589436ddd5b1ad908ed1b59e0b97825 (patch)
tree60e992fa68cfd89b096f0b0b2ae001d1218d1cc9 /test/ext/declarative
parent956c144c7feae68fa957eb62ede4b21cd818c737 (diff)
downloadsqlalchemy-00f2b19a5589436ddd5b1ad908ed1b59e0b97825.tar.gz
extension tests
Diffstat (limited to 'test/ext/declarative')
-rw-r--r--test/ext/declarative/test_basic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ext/declarative/test_basic.py b/test/ext/declarative/test_basic.py
index 50d40e8fc..ad2970b70 100644
--- a/test/ext/declarative/test_basic.py
+++ b/test/ext/declarative/test_basic.py
@@ -13,7 +13,7 @@ from sqlalchemy.orm import relationship, create_session, class_mapper, \
deferred, column_property, composite,\
Session
from sqlalchemy.testing import eq_
-from sqlalchemy.util import classproperty
+from sqlalchemy.util import classproperty, with_metaclass
from sqlalchemy.ext.declarative import declared_attr, AbstractConcreteBase, \
ConcreteBase, synonym_for
from sqlalchemy.testing import fixtures
@@ -133,7 +133,7 @@ class DeclarativeTest(DeclarativeTestBase):
# even though this class has an xyzzy attribute, getattr(cls,"xyzzy")
# fails
- class BrokenParent(object, metaclass=BrokenMeta):
+ class BrokenParent(with_metaclass(BrokenMeta)):
xyzzy = "magic"
# _as_declarative() inspects obj.__class__.__bases__
@@ -274,7 +274,7 @@ class DeclarativeTest(DeclarativeTestBase):
__tablename__ = 'foo'
id = Column(Integer, primary_key=True)
- _user_id = Column(Integer)
+ _user_id = Column(Integer)
rel = relationship('User',
uselist=False,
foreign_keys=[User.id],