From 43dd351c832d7fdc5608e4160d5e1d14f0f8b3d1 Mon Sep 17 00:00:00 2001
From: "Zheng, Lei" <realthunder.dev@gmail.com>
Date: Sat, 25 May 2019 13:29:25 +0800
Subject: [PATCH] Fix system slvs module search

---
 sys_slvs.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/sys_slvs.py b/sys_slvs.py
index 95d2ec4..a9f73fc 100644
--- a/sys_slvs.py
+++ b/sys_slvs.py
@@ -4,17 +4,20 @@ from .utils import syslogger as logger, objName
 import platform, sys
 
 try:
-    from py_slvs import slvs
+    import slvs
 except ImportError:
-    if platform.system() == 'Darwin':
-        if sys.version_info[0] == 3:
-            from .py3_slvs_mac import slvs
+    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_mac import slvs
-    elif sys.version_info[0] == 3:
-        from .py3_slvs import slvs
-    else:
-        from .py_slvs import slvs
+            from .py_slvs import slvs
 
 class SystemSlvs(with_metaclass(System, SystemBase)):
     _id = 1