Skip to content

Commit 32507b4

Browse files
committed
Merge pull request #1 from shulai/master
Fixes required for newer Python versions and Linux platform detection.
2 parents 8f3793f + 75cc01d commit 32507b4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pyScanLib/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import sys
2-
import unitConverter # Contains unit converting functions ie millimeter to inch (mmToInch) etc
2+
from . import unitConverter # Contains unit converting functions ie millimeter to inch (mmToInch) etc
33

44
"""
55
* pyScanLib
@@ -33,13 +33,13 @@
3333
platform = sys.platform
3434

3535
if platform == "win32":
36-
import twainLib
36+
from . import twainLib
3737

3838
class pyScanLib(twainLib.twainLib, unitConverter.unitConverter):
3939
pass
4040

41-
elif platform == "linux":
42-
import saneLib
41+
elif platform.startswith("linux"):
42+
from . import saneLib
4343

4444
class pyScanLib(saneLib.saneLib, unitConverter.unitConverter):
4545
pass

0 commit comments

Comments
 (0)