temscript 2.0.1__tar.gz → 2.1.0__tar.gz

{temscript-2.0.1/temscript.egg-info → temscript-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: temscript
-Version: 2.0.1
+Version: 2.1.0
 Summary: TEM Scripting adapter for FEI microscopes
 Home-page: https://github.com/niermann/temscript
 Author: Tore Niermann
@@ -21,6 +21,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: platform
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # About
 

{temscript-2.0.1 → temscript-2.1.0}/docs/changelog.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 2.1.0
+^^^^^^^^^^^^^
+
+* Changed default apartment model to COINIT_APARTMENTTHREADED to increase compatibility with comtypes
+* COM initialization respects setting from sys.coinit_flags
+
 Version 2.0.1
 ^^^^^^^^^^^^^
 

{temscript-2.0.1 → temscript-2.1.0}/docs/instrument.rst

@@ -13,6 +13,13 @@ The interface is described in detail in the scripting manual of your microscope
 The manual is your ultimate reference, this documentation will only describe the
 python wrapper to the COM interface.
 
+The COM apartment model will automatically be initialized as ``COINIT_APARTMENTTHREADED``
+(this changed in Version 2.1.0, it was ``COINIT_MULTITHREADED`` before). However, if the
+apartment model was already initialized as ``COINIT_MULTITHREADED`` before `temscript`
+was imported, `temscript` will also work. If you want a specific apartment model, set the
+variable ``sys.coinit_flags`` before importing `temscript`.
+
+
 Enumerations
 ^^^^^^^^^^^^
 

{temscript-2.0.1 → temscript-2.1.0}/temscript/_com.py

@@ -6,6 +6,7 @@ __all__ = 'UUID', 'CLSCTX_ALL', 'IUnknown', 'co_create_instance', 'SafeArray', '
 
 # COM constants
 COINIT_MULTITHREADED = 0
+COINIT_APARTMENTTHREADED = 2
 CLSCTX_ALL = 0x17
 
 
@@ -370,5 +371,27 @@ class SafeArray:
 
 
 _ole32 = ctypes.oledll.ole32
-_ole32.CoInitializeEx(None, ctypes.c_int(COINIT_MULTITHREADED))
 _oleauto = ctypes.windll.oleaut32
+
+def initialize_com(flags=None):
+    RPC_E_CHANGED_MODE = -2147417850
+
+    # The comtypes package allows to specify the apartment model by
+    # setting sys.coinit_flags in advance. We copy this behavior.
+    if flags is None:
+        import sys
+        flags = getattr(sys, "coinit_flags", None)
+
+    if flags is None:
+        # If we don't have explicit flags, try STA first and fall back to MTA
+        # if COM is already initialized to MTA.
+        try:
+            _ole32.CoInitializeEx(None, ctypes.c_int(COINIT_APARTMENTTHREADED))
+        except WindowsError as exc:
+            if exc.winerror == RPC_E_CHANGED_MODE:
+                _ole32.CoInitializeEx(None, ctypes.c_int(COINIT_MULTITHREADED))
+    else:
+        # Otherwise, use the apartment model we got
+        _ole32.CoInitializeEx(None, flags)
+
+initialize_com()

{temscript-2.0.1 → temscript-2.1.0}/temscript/base_microscope.py

@@ -641,7 +641,11 @@ class BaseMicroscope(ABC):
     def get_indicated_camera_length(self):
         """
         Return (indicated) camera length in meters in diffraction modes.
-        If microscope is in imaging mode, 0 is returned.
+
+        .. note::
+            The scripting manual states, that this function always returns 0,
+            if microscope is in imaging mode. In STEM mode this
+            function works reportedly nevertheless.
 
         .. versionadded:: 1.0.9
         """
@@ -651,7 +655,11 @@ class BaseMicroscope(ABC):
     def get_indicated_magnification(self):
         """
         Return (indicated) magnification in imaging modes.
-        If microscope is in diffraction mode, 0 is returned.
+
+        .. note::
+            The scripting manual states, that this function always returns 0,
+            if microscope is in diffraction mode. In STEM mode this
+            function works reportedly nevertheless.
 
         .. note::
             On Titan 1.1 software this method returns 0.0 regardless of used mode. See :ref:`restrictions`.

temscript-2.1.0/temscript/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.0'

{temscript-2.0.1 → temscript-2.1.0/temscript.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: temscript
-Version: 2.0.1
+Version: 2.1.0
 Summary: TEM Scripting adapter for FEI microscopes
 Home-page: https://github.com/niermann/temscript
 Author: Tore Niermann
@@ -21,6 +21,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: platform
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # About
 

temscript-2.0.1/temscript/version.py

@@ -1 +0,0 @@
-__version__ = '2.0.1'