Merge pull request #1 from shulai/master

Fixes required for newer Python versions and Linux platform detection.
soachishti · May 16, 2016 · 32507b4 · 32507b4
2 parents 8f3793f + 75cc01d
commit 32507b4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pyScanLib/__init__.py b/pyScanLib/__init__.py
@@ -1,5 +1,5 @@
 import sys
-import unitConverter  # Contains unit converting functions ie millimeter to inch (mmToInch) etc
+from . import unitConverter  # Contains unit converting functions ie millimeter to inch (mmToInch) etc
 
 """
  * pyScanLib
@@ -33,13 +33,13 @@
 platform = sys.platform
 
 if platform == "win32":
-    import twainLib
+    from . import twainLib
 
     class pyScanLib(twainLib.twainLib, unitConverter.unitConverter):
         pass
 
-elif platform == "linux":
-    import saneLib
+elif platform.startswith("linux"):
+    from . import saneLib
 
     class pyScanLib(saneLib.saneLib, unitConverter.unitConverter):
         pass