Changeset 1160 for framspy

Timestamp:

11/29/21 03:25:01 (3 years ago)

Author:

Maciej Komosinski

Message:

Supported python 3.8+ and Windows after breaking change in python 3.8 - new behavior after adding os.add_dll_directory()

File:

• framspy/frams.py (modified) (3 diffs)

framspy/frams.py

@@ -321 +321 @@
                 lib_path = '.'
 
-        original_dir = os.getcwd()
-        os.chdir(lib_path)  # because under Windows, frams-objects.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found while loading the main dll.
-        # TODO in python 3.8+ and Windows, use os.add_dll_directory(lib_path) instead of os.chdir()? And maybe for linux we no longer need chdir() and "./", but use absolute path?
-        abs_data = os.path.abspath('data')  # use absolute path for -d and -D so python is free to cd anywhere without confusing Framsticks
+        if os.name == 'nt':
+                if sys.version_info < (3, 8):
+                        original_dir = os.getcwd()
+                        os.chdir(lib_path)  # because under Windows, frams-objects.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found while loading the main dll.
+                else:
+                        os.add_dll_directory(lib_path)
+        abs_data = os.path.join(os.path.abspath(lib_path), "data")  # use absolute path for -d and -D so python is free to cd anywhere without confusing Framsticks
+
+
         # for the hypothetical case without lib_path the abs_data must be obtained from somewhere else
         if frams_d is None:
@@ -336 +341 @@
         global c_api  # access global variable
         if lib_path is not None and os.name == 'posix':
-                lib_name = './' + lib_name  # currently we always have lib_path (even if it is incorrect), but hypothetically it could work with lib_path==None and then load .so from some default system path without './'
+                lib_name = os.path.join(lib_path, lib_name)  # currently we always have lib_path (even if it is incorrect), but hypothetically it could work with lib_path==None and then load .so from some default system path without './'
         try:
                 c_api = ctypes.CDLL(lib_name)  # if accessing this module from multiple threads, they will all share a single c_api and access the same copy of the library and its data. If you want separate independent copies, read the comment at the top of this file on using the "multiprocessing" module.
@@ -342 +347 @@
                 print("*** Could not find or open '%s' from '%s'.\n*** Did you provide proper arguments and is this file readable?\n" % (lib_name, os.getcwd()))
                 raise
-        os.chdir(original_dir)  # restore current working dir after loading the library so Framsticks sees the expected directory
+
+        if os.name == 'nt' and sys.version_info < (3, 8):
+                os.chdir(original_dir)  # restore current working dir after loading the library so Framsticks sees the expected directory
 
         c_api.init.argtypes = [ctypes.c_int, ctypes.POINTER(ctypes.c_char_p)]