salabim 25.0.9__py3-none-any.whl → 25.0.9.post1__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()
-PythonInExcel = not ("__file__" in globals())
-AnacondaCode = sys.platform == "emscripten"
+#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",
@@ -115,7 +116,7 @@ def a_log(*args):
 class g: ...
 
 
-if PythonInExcel or AnacondaCode:
+if Embedded:
     _pie_result = []
 
     def pie_result():
@@ -190,7 +191,7 @@ if Pythonista:
 inf = float("inf")
 nan = float("nan")
 
-if Pythonista or AnacondaCode or PythonInExcel:
+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 PythonInExcel or AnacondaCode:
-            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():
@@ -11945,7 +11958,7 @@ class Environment:
                     if self._video_pingpong:
                         self._images.extend(self._images[::-1])
                     if self._video_repeat == 1:  # in case of repeat == 1, loop should not be specified (otherwise, it might show twice)
-                        if PythonInExcel or AnacondaCode:
+                        if Embedded:
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -11972,7 +11985,7 @@ class Environment:
                                     self._images = [image.convert("RGB") for image in self._images]
 
                     else:
-                        if PythonInExcel or AnacondaCode:
+                        if Embedded:
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -13589,7 +13602,7 @@ class Environment:
             mode = "RGB"
         else:
             raise ValueError("extension " + extension + "  not supported")
-        if PythonInExcel or AnacondaCode:
+        if Embedded:
             with b64_file_handler(str(filename), mode="b", result=_pie_result) as f:
                 format = "jpeg" if extension == ".jpg" else extension[1:]
                 self._capture_image(mode, video_mode).save(f, format=format)
@@ -14606,15 +14619,15 @@ class Environment:
         note that the header is only printed if trace=True
         """
         len_s1 = len(self.time_to_str(0))
-        self.print_trace((len_s1 - 4) * " " + "time", "current component", "action", "information", "" if (PythonInExcel or AnacondaCode) else "line#")
-        self.print_trace(len_s1 * "-", 20 * "-", 35 * "-", 48 * "-", "" if (PythonInExcel or AnacondaCode) else 6 * "-")
+        self.print_trace((len_s1 - 4) * " " + "time", "current component", "action", "information", "" if (Embedded) else "line#")
+        self.print_trace(len_s1 * "-", 20 * "-", 35 * "-", 48 * "-", "" if (Embedded) else 6 * "-")
         for ref in range(len(self._source_files)):
             for fullfilename, iref in self._source_files.items():
                 if ref == iref:
                     self._print_legend(iref)
 
     def _print_legend(self, ref):
-        if PythonInExcel or AnacondaCode:
+        if Embedded:
             return
         if ref:
             s = "line numbers prefixed by " + chr(ord("A") + ref - 1) + " refer to"
@@ -14632,7 +14645,7 @@ class Environment:
         return self.filename_lineno_to_str(frameinfo.filename, frameinfo.lineno)
 
     def filename_lineno_to_str(self, filename, lineno):
-        if PythonInExcel or AnacondaCode:
+        if Embedded:
             return "n/a"
         if Path(filename).name == Path(__file__).name:  # internal salabim address
             return "n/a"
@@ -25137,7 +25150,7 @@ def _check_overlapping_parameters(obj, method_name0, method_name1,process=None):
 
 @functools.lru_cache()
 def _screen_dimensions():
-    if PythonInExcel or AnacondaCode:
+    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 PythonInExcel or AnacondaCode:
+    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 (PythonInExcel or AnacondaCode):
+        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 (PythonInExcel or AnacondaCode):
+    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.dist-info → salabim-25.0.9.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salabim
-Version: 25.0.9
+Version: 25.0.9.post1
 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.post1.dist-info/RECORD

@@ -0,0 +1,10 @@
+salabim/DejaVuSansMono.ttf,sha256=Z_oIXp5yp1Zaw2y2p3vaxwHhjHpG0MFbmwhxSh4aIEI,335068
+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=NqBc-nHOhBooYA8CPsVMhGaXCgSnyP4bdMpZfgFiSrE,1125989
+salabim-25.0.9.post1.dist-info/METADATA,sha256=DhaAY8DEfPtIcM6l7yrKKrAQ_rPj7AiBdH_B0hyCxy8,3405
+salabim-25.0.9.post1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+salabim-25.0.9.post1.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-25.0.9.post1.dist-info/RECORD,,

{salabim-25.0.9.dist-info → salabim-25.0.9.post1.dist-info}/WHEEL

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

salabim-25.0.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-salabim/DejaVuSansMono.ttf,sha256=Z_oIXp5yp1Zaw2y2p3vaxwHhjHpG0MFbmwhxSh4aIEI,335068
-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=vSMVcWlHrZKShotu15QJ_THLqTUbheGw5gsLnoDhca0,1125470
-salabim-25.0.9.dist-info/METADATA,sha256=cJClhCPVdf31-iu49ZJwLmP1u43l6MFBUZBesLrf92s,3399
-salabim-25.0.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-salabim-25.0.9.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-25.0.9.dist-info/RECORD,,