From dcef039b6f31dc8c400b3bbe74ab7692087751f1 Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Fri, 24 May 2019 07:43:17 +0000 Subject: [PATCH] Add slvs prebuilt for Python3 --- .gitmodules | 3 +++ py3_slvs | 1 + sys_slvs.py | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 160000 py3_slvs diff --git a/.gitmodules b/.gitmodules index f10c8d3..5fe19da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "py_slvs_mac"] path = py_slvs_mac url = https://github.com/realthunder/py_slvs_mac.git +[submodule "py3_slvs"] + path = py3_slvs + url = https://github.com/realthunder/py3_slvs.git diff --git a/py3_slvs b/py3_slvs new file mode 160000 index 0000000..30f3476 --- /dev/null +++ b/py3_slvs @@ -0,0 +1 @@ +Subproject commit 30f34766bbdf129536e682f1dcb302f5ac06c81c diff --git a/sys_slvs.py b/sys_slvs.py index e3df6d7..95d2ec4 100644 --- a/sys_slvs.py +++ b/sys_slvs.py @@ -1,14 +1,19 @@ from .deps import with_metaclass from .system import System, SystemBase, SystemExtension from .utils import syslogger as logger, objName -import platform +import platform, sys -if platform.system() == 'Darwin': - from .py_slvs_mac import slvs -else: - try: - from py_slvs import slvs - except ImportError: +try: + from py_slvs import slvs +except ImportError: + if platform.system() == 'Darwin': + if sys.version_info[0] == 3: + from .py3_slvs_mac import slvs + else: + from .py_slvs_mac import slvs + elif sys.version_info[0] == 3: + from .py3_slvs import slvs + else: from .py_slvs import slvs class SystemSlvs(with_metaclass(System, SystemBase)):