salabim 25.0.9.post0__py3-none-any.whl → 25.0.9.post2__py3-none-any.whl

salabim/salabim.py

@@ -57,8 +57,9 @@ Windows = sys.platform.startswith("win")
 PyDroid = sys.platform == "linux" and any("pydroid" in v for v in os.environ.values())
 PyPy = platform.python_implementation() == "PyPy"
 Chromebook = "penguin" in platform.uname()
-Xlwings="xlwings" in sys.path
-Embedded = (not ("__file__" in globals())) or ((sys.platform == "emscripten") and not Xlwings)  # Python In Excel or pyoide (AnacondaCode or xlwings lite)
+#Xlwings="xlwings" in sys.modules
+Xlwings=sys.platform=="emscripten"
+Embedded = False # (not ("__file__" in globals())) or ((sys.platform == "emscripten") and not Xlwings)  # Python In Excel or pyoide (AnacondaCode or xlwings lite)
 
 _color_name_to_ANSI = dict(
     dark_black="\033[0;30m",
@@ -190,7 +191,7 @@ if Pythonista:
 inf = float("inf")
 nan = float("nan")
 
-if Pythonista or Embedded:
+if Pythonista or Embedded or Xlwings:
     _yieldless = False
 else:
     _yieldless = True
@@ -228,6 +229,13 @@ def yieldless(value: bool = None) -> bool:
 
     global _yieldless
     if value is not None:
+        if value:
+            if Pythonista:
+                raise ValueError('yiedless mode is not allowed under Pythonista')
+            if Embedded:
+                raise ValueError('yiedless mode is not allowed under Python in Excel or Anaconda Code')
+            if Xlwings:
+                raise ValueError('yiedless mode is not allowed under xlwings lite')                               
         _yieldless = value
     return _yieldless
 
@@ -10551,7 +10559,7 @@ class Environment:
         isdefault_env: bool = True,
         retina: bool = False,
         do_reset: bool = None,
-        blind_animation: bool = False,
+        blind_animation: bool = None,
         yieldless: bool = None,
         **kwargs,
     ):
@@ -10648,10 +10656,15 @@ class Environment:
         self.stopped = False
         self._paused = False
         self.last_s0 = ""
-        if Embedded:
-            self._blind_animation = True
+        if Embedded or Xlwings:
+            if blind_animation is None:
+                blind_animation=True
+            if not blind_animation:
+                raise ValueError("blind_animation may not be False under xlwings lite")
         else:
-            self._blind_animation = blind_animation
+            if blind_animation is None:
+                blind_animation=False
+        self._blind_animation = blind_animation
 
         if self._blind_animation:
             with self.suppress_trace():
@@ -25137,7 +25150,7 @@ def _check_overlapping_parameters(obj, method_name0, method_name1,process=None):
 
 @functools.lru_cache()
 def _screen_dimensions():
-    if Embedded:
+    if Embedded or Xlwings:
         return 1024, 768
     if Pythonista:
         screen_width, screen_height = ui.get_screen_size()
@@ -27165,7 +27178,7 @@ def _std_fonts():
 
 
 def fonts():
-    if Embedded:
+    if Embedded or Xlwings:
         return []
     if not hasattr(fonts, "font_list"):
         fonts.font_list = []
@@ -27438,7 +27451,7 @@ def can_animate(try_only: bool = True) -> bool:
         except ImportError:
             ImageGrab = None
 
-        if not Pythonista and not (Embedded):
+        if not Pythonista and not (Embedded or Xlwings):
             from PIL import ImageTk
     except ImportError:
         if try_only:
@@ -27447,7 +27460,7 @@ def can_animate(try_only: bool = True) -> bool:
 
     g.dummy_image = Image.new("RGBA", (1, 1), (0, 0, 0, 0))
 
-    if not Pythonista and not (Embedded):
+    if not Pythonista and not (Embedded or Xlwings):
         if PyDroid:
             if not g.tkinter_loaded:
                 if try_only:
@@ -27951,7 +27964,7 @@ def captured_stdout_as_file(file: Union[str, Path, "file"], mode: str = None):
         file.write(captured_stdout_as_str())
 
 
-def captured_stdout_as_list(column_name: str = None) -> list:
+def captured_stdout_as_list() -> list:
     """
     returns the captured stdout as a list of strings
 

{salabim-25.0.9.post0.dist-info → salabim-25.0.9.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salabim
-Version: 25.0.9.post0
+Version: 25.0.9.post2
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-25.0.9.post0.dist-info → salabim-25.0.9.post2.dist-info}/RECORD

@@ -3,8 +3,8 @@ salabim/LICENSE.txt,sha256=eTPlcDJz4G0096Qv-wfMjm1Wxbd4ilDlsYg5rN4HjWQ,1106
 salabim/__init__.py,sha256=r7qPLvlmX0dkZDyjuTo8Jo3ex3sD1L4pmK6K5ib9vyw,56
 salabim/calibri.ttf,sha256=RWpf8Uo31RfvGGNaSt9-2sXSuN87AVE_NFMRsV3LhBk,1330156
 salabim/mplus-1m-regular.ttf,sha256=EuFHr90BJjuAn_r5MleJFN-WfkeWJ4tf7DweI5zr8tU,289812
-salabim/salabim.py,sha256=xhJYFXHhW7tgkivID6pKL1sAG43F-sQK-CxfRX8U73o,1125271
-salabim-25.0.9.post0.dist-info/METADATA,sha256=QAVd2_PWiTB9aP53ioD2fnXbuxwuhb7BT7LhCQZKuCk,3405
-salabim-25.0.9.post0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-salabim-25.0.9.post0.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-25.0.9.post0.dist-info/RECORD,,
+salabim/salabim.py,sha256=wNIHiSS93kWglqmU6jy6KQMZCLAUoaofvqsPUP_PvPE,1125989
+salabim-25.0.9.post2.dist-info/METADATA,sha256=1OIHo3tsAKXsDxdo8x3g6_-fXs9Hhlvh0hYoECG3XPs,3405
+salabim-25.0.9.post2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+salabim-25.0.9.post2.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-25.0.9.post2.dist-info/RECORD,,

{salabim-25.0.9.post0.dist-info → salabim-25.0.9.post2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any