TSMasterAPI 2024.8.19.1167__tar.gz → 2024.8.21.1168__tar.gz

{TSMasterAPI-2024.8.19.1167 → TSMasterAPI-2024.8.21.1168}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSMasterAPI
-Version: 2024.8.19.1167
+Version: 2024.8.21.1168
 Summary: Use TSMaster hardware
 Home-page: UNKNOWN
 Author: seven

{TSMasterAPI-2024.8.19.1167 → TSMasterAPI-2024.8.21.1168}/TSMasterAPI/TSDirver.py

@@ -11,6 +11,8 @@ import platform
 
 TSMaster_location = r"Software\TOSUN\TSMaster"
 
+_curr_path = os.path.dirname(__file__)
+
 key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, TSMaster_location)
 
 _arch, _os = platform.architecture()
@@ -42,6 +44,13 @@ if dll_path != '':
         dllPath = os.path.split(dll_path)[0]
         dll = WinDLL(dll_path)
     except Exception as r:
-        print(r"Could not load the TOSUN DLL from '%s'. Error: %s" % (dll_path, r))
+        try:
+            if _arch == '32bit':
+                dll_path = _curr_path + "\\windows\\bin\\TSMaster.dll"
+            else:
+                dll_path = _curr_path + "\\windows\\bin64\\TSMaster.dll"
+            dll = WinDLL(dll_path)
+        except Exception as r:
+            print(r"Could not load the TOSUN DLL from '%s'. Error: %s" % (dll_path, r))
 else:
     print(r"Could not load the TOSUN DLL Error: Registry not found")

TSMasterAPI-2024.8.21.1168/TSMasterAPI/__init__.py

@@ -0,0 +1,2 @@
+from .TSAPI import *
+__version__ = 'v2024.8.21.1168'

{TSMasterAPI-2024.8.19.1167 → TSMasterAPI-2024.8.21.1168}/TSMasterAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TSMasterAPI
-Version: 2024.8.19.1167
+Version: 2024.8.21.1168
 Summary: Use TSMaster hardware
 Home-page: UNKNOWN
 Author: seven

{TSMasterAPI-2024.8.19.1167 → TSMasterAPI-2024.8.21.1168}/setup.py

@@ -29,10 +29,11 @@ setup(name='TSMasterAPI',  # 包名
       install_requires=[],
       license='Apache License',
       packages=find_packages(),
-      data_files=[
-        ('./TSMasterAPI/windows/bin', ['./TSMasterAPI/windows/bin/TSMaster.dll']),
-        ('./TSMasterAPI/windows/bin64', ['./TSMasterAPI/windows/bin64/TSMaster.dll'])
-      ],
+      include_package_data=True,
+      # data_files=[
+      #   ('./TSMasterAPI/windows/bin', ['./TSMasterAPI/windows/bin/TSMaster.dll']),
+      #   ('./TSMasterAPI/windows/bin64', ['./TSMasterAPI/windows/bin64/TSMaster.dll'])
+      # ],
       platforms=["WINDOWS"],
       classifiers=[
           'Intended Audience :: Developers',

TSMasterAPI-2024.8.19.1167/TSMasterAPI/__init__.py

@@ -1,2 +0,0 @@
-from .TSAPI import *
-__version__ = 'v2024.8.19.1167'