salabim 24.0.10.post7__tar.gz → 24.0.11.post0__tar.gz

{salabim-24.0.10.post7 → salabim-24.0.11.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.10.post7
+Version: 24.0.11.post0
 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-24.0.10.post7 → salabim-24.0.11.post0}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "salabim - discrete event simulation in Python"
-version = "24.0.10-7"
+version = "24.0.11-0"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{salabim-24.0.10.post7 → salabim-24.0.11.post0}/salabim/salabim.py

@@ -1,13 +1,13 @@
-#               _         _      _               ____   _  _        ___      _   ___
-#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \    / | / _ \
-#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | || | | |
-#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | || |_| |
-#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_)|_| \___/
+#               _         _      _               ____   _  _        ___      _  _
+#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \    / |/ |
+#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | || |
+#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | || |
+#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_)|_||_|
 #                    discrete event simulation
 #
 #  see www.salabim.org for more information, the documentation and license information
 
-__version__ = "24.0.10"
+__version__ = "24.0.11"
 
 import heapq
 import random
@@ -60,9 +60,8 @@ PyDroid = sys.platform == "linux" and any("pydroid" in v for v in os.environ.val
 PyPy = platform.python_implementation() == "PyPy"
 Chromebook = "penguin" in platform.uname()
 PythonInExcel = not ("__file__" in globals())
-AnacondaCode="pyscript" in sys.modules
+AnacondaCode = sys.platform=="emscripten"
 
-my_globals=globals()
 
 def a_log(*args):
     if not hasattr(a_log, "a_logfile_name"):
@@ -77,7 +76,7 @@ def a_log(*args):
 class g: ...
 
 
-if (PythonInExcel or AnacondaCode):
+if PythonInExcel or AnacondaCode:
     _pie_result = []
 
     def pie_result():
@@ -856,7 +855,7 @@ class Monitor:
                 stop += self.env._offset
                 stop_action = "b"  # non inclusive
             if self.env._animate:
-                stop=min(stop,self.env._t)
+                stop = min(stop, self.env._t)
             else:
                 stop = min(stop, self.env._now - self.env._offset)  # not self.now() in order to support frozen monitors
             actions.append((start, "a", 0, 0))
@@ -891,21 +890,20 @@ class Monitor:
 
         enabled = False
         if self.env._animate:
-            _x=self._x[:]
-            _t=self._t[:]
+            _x = self._x[:]
+            _t = self._t[:]
             if self._x:
                 _x.append(self._x[-1])
                 _t.append(self.env._t)
-            if isinstance(self._weight,bool):
-                _weight=self._weight
+            if isinstance(self._weight, bool):
+                _weight = self._weight
             else:
-                _weight=self._weight[:]
+                _weight = self._weight[:]
                 _weight.append(self._weight[-1])
         else:
-            _x=self._x
-            _t=self._t
-            _weight=self._weight
-
+            _x = self._x
+            _t = self._t
+            _weight = self._weight
 
         if self.env._animate:
             if self._x:
@@ -914,10 +912,8 @@ class Monitor:
             try:
                 _weight.append(self.weight[-1])
             except AttributeError:
-                ... # ignore if bool
-        for t, type, x, weight in heapq.merge(
-            actions, zip(self._t, itertools.repeat("c"), _x, _weight if (_weight and not self._level) else (1,) * len(_x))
-        ):
+                ...  # ignore if bool
+        for t, type, x, weight in heapq.merge(actions, zip(self._t, itertools.repeat("c"), _x, _weight if (_weight and not self._level) else (1,) * len(_x))):
             if new._level:
                 if type == "a":
                     enabled = True
@@ -10209,7 +10205,7 @@ class Environment:
         self.stopped = False
         self._paused = False
         self.last_s0 = ""
-        if (PythonInExcel or AnacondaCode):
+        if PythonInExcel or AnacondaCode:
             self._blind_animation = True
         else:
             self._blind_animation = blind_animation
@@ -11504,7 +11500,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 PythonInExcel or AnacondaCode:  # ***
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -11525,7 +11521,7 @@ class Environment:
                                 optimize=False,
                             )
                     else:
-                        if (PythonInExcel or AnacondaCode):  # ***
+                        if PythonInExcel or AnacondaCode:  # ***
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -13114,7 +13110,7 @@ class Environment:
             mode = "RGB"
         else:
             raise ValueError("extension " + extension + "  not supported")
-        if (PythonInExcel or AnacondaCode):
+        if PythonInExcel or AnacondaCode:
             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)
@@ -14139,7 +14135,7 @@ class Environment:
                     self._print_legend(iref)
 
     def _print_legend(self, ref):
-        if (PythonInExcel or AnacondaCode):
+        if PythonInExcel or AnacondaCode:
             return
         if ref:
             s = "line numbers prefixed by " + chr(ord("A") + ref - 1) + " refer to"
@@ -14157,7 +14153,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 PythonInExcel or AnacondaCode:
             return "n/a"
         if Path(filename).name == Path(__file__).name:  # internal salabim address
             return "n/a"
@@ -24264,7 +24260,7 @@ def _set_name(name, _nameserialize, object):
 
 @functools.lru_cache()
 def _screen_dimensions():
-    if (PythonInExcel or AnacondaCode):
+    if PythonInExcel or AnacondaCode:
         return 1024, 768
     if Pythonista:
         screen_width, screen_height = ui.get_screen_size()
@@ -26280,7 +26276,7 @@ def _std_fonts():
 
 
 def fonts():
-    if (PythonInExcel or AnacondaCode):
+    if PythonInExcel or AnacondaCode:
         return []
     if not hasattr(fonts, "font_list"):
         fonts.font_list = []
@@ -26946,6 +26942,7 @@ def reset() -> None:
     g.tkinter_loaded = "?"
     g.image_container_cache = {}
     g._default_cap_now = False
+    g._captured_stdout=[]
 
     random_seed()  # always start with seed 1234567
 
@@ -27003,15 +27000,11 @@ Environment.{name}.__doc__ = {name}.__doc__"""
                 exec(f"Environment.{name}={name}")
 
 
-_captured_store = []
-
-
 def clear_captured_stdout():
     """
     empties the captured stdout
     """
-    global _captured_store
-    _captured_store.clear()
+    g._captured_stdout.clear()
 
 
 def captured_stdout_as_str() -> str:
@@ -27023,7 +27016,7 @@ def captured_stdout_as_str() -> str:
     captured stdout : str
     """
 
-    return "".join(_captured_store)
+    return "".join(g._captured_stdout)
 
 
 def captured_stdout_as_file(file: Union[str, Path, "file"], mode: str = None):
@@ -27101,16 +27094,14 @@ class capture_stdout:
         sys.stdout = self.stdout
 
     def write(self, data):
-        global _captured_store
-        _captured_store.append(data)
+        g._captured_stdout.append(data)
         if self.include_print:
             self.stdout.write(data)
 
     def flush(self):
-        global _captured_store
         if self.include_print:
             self.stdout.flush()
-        _captured_store.append("\n")
+        g._captured_stdout.append("\n")
 
 
 class redirect_stdout:
@@ -27168,7 +27159,7 @@ class redirect_stdout:
         self.close()
 
     def write(self, data):
-        global _captured_store
+        global _captured_stdout
         self.file.write(data)
         if self.include_print:
             self.stdout.write(data)

{salabim-24.0.10.post7 → salabim-24.0.11.post0}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.10.post7
+Version: 24.0.11.post0
 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