summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/kolab_parse_telemetry.py7
-rw-r--r--pykolab/telemetry.py7
2 files changed, 12 insertions, 2 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:
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: