summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-02-11 14:33:01 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-02-11 14:33:01 +0100
commit94dc3f68914a9aaf3d2441f90b2577afde05cf4b (patch)
treef178c7ed136f95215773b37a2fbfd8d7f676daff /bin
parent5fa5c3d1cf2cb04e96d47efa4bfcfcc0104e6834 (diff)
downloadpykolab-94dc3f68914a9aaf3d2441f90b2577afde05cf4b.tar.gz
Catch sqlalchemy API incompatibility
Diffstat (limited to 'bin')
-rwxr-xr-xbin/kolab_parse_telemetry.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/kolab_parse_telemetry.py b/bin/kolab_parse_telemetry.py
index cb447e8..ea4da25 100755
--- a/bin/kolab_parse_telemetry.py
+++ b/bin/kolab_parse_telemetry.py
@@ -41,7 +41,12 @@ from sqlalchemy import Text
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: