diff options
author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-02-11 14:33:01 +0100 |
---|---|---|
committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-02-11 14:33:01 +0100 |
commit | 94dc3f68914a9aaf3d2441f90b2577afde05cf4b (patch) | |
tree | f178c7ed136f95215773b37a2fbfd8d7f676daff /pykolab | |
parent | 5fa5c3d1cf2cb04e96d47efa4bfcfcc0104e6834 (diff) | |
download | pykolab-94dc3f68914a9aaf3d2441f90b2577afde05cf4b.tar.gz |
Catch sqlalchemy API incompatibility
Diffstat (limited to 'pykolab')
-rw-r--r-- | pykolab/telemetry.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pykolab/telemetry.py b/pykolab/telemetry.py index 345e49c..0b95da8 100644 --- a/pykolab/telemetry.py +++ b/pykolab/telemetry.py @@ -41,7 +41,12 @@ from sqlalchemy.interfaces import PoolListener from sqlalchemy import create_engine from sqlalchemy.orm import mapper -from sqlalchemy.orm import relationship + +try: + from sqlalchemy.orm import relationship +except: + from sqlalchemy.orm import relation as relationship + try: from sqlalchemy.orm import sessionmaker except: |