salabim 24.0.10.post4__tar.gz → 24.0.10.post7__tar.gz

{salabim-24.0.10.post4 → salabim-24.0.10.post7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.10.post4
+Version: 24.0.10.post7
 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.post4 → salabim-24.0.10.post7}/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-4"
+version = "24.0.10-7"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{salabim-24.0.10.post4 → salabim-24.0.10.post7}/salabim/salabim.py

@@ -59,7 +59,8 @@ 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()) or ("REF" in globals()) # REF is for AnacondaCode
+PythonInExcel = not ("__file__" in globals())
+AnacondaCode="pyscript" in sys.modules
 
 my_globals=globals()
 
@@ -76,7 +77,7 @@ def a_log(*args):
 class g: ...
 
 
-if PythonInExcel:
+if (PythonInExcel or AnacondaCode):
     _pie_result = []
 
     def pie_result():
@@ -10208,7 +10209,7 @@ class Environment:
         self.stopped = False
         self._paused = False
         self.last_s0 = ""
-        if PythonInExcel:
+        if (PythonInExcel or AnacondaCode):
             self._blind_animation = True
         else:
             self._blind_animation = blind_animation
@@ -11503,7 +11504,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:  # ***
+                        if (PythonInExcel or AnacondaCode):  # ***
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -11524,7 +11525,7 @@ class Environment:
                                 optimize=False,
                             )
                     else:
-                        if PythonInExcel:  # ***
+                        if (PythonInExcel or AnacondaCode):  # ***
                             with b64_file_handler(self._video_name, mode="b", result=_pie_result) as f:
                                 self._images[0].save(
                                     f,
@@ -13113,7 +13114,7 @@ class Environment:
             mode = "RGB"
         else:
             raise ValueError("extension " + extension + "  not supported")
-        if PythonInExcel:
+        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)
@@ -14130,15 +14131,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 else "line#")
-        self.print_trace(len_s1 * "-", 20 * "-", 35 * "-", 48 * "-", "" if PythonInExcel else 6 * "-")
+        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 * "-")
         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:
+        if (PythonInExcel or AnacondaCode):
             return
         if ref:
             s = "line numbers prefixed by " + chr(ord("A") + ref - 1) + " refer to"
@@ -14156,7 +14157,7 @@ class Environment:
         return self.filename_lineno_to_str(frameinfo.filename, frameinfo.lineno)
 
     def filename_lineno_to_str(self, filename, lineno):
-        if PythonInExcel:
+        if (PythonInExcel or AnacondaCode):
             return "n/a"
         if Path(filename).name == Path(__file__).name:  # internal salabim address
             return "n/a"
@@ -24263,7 +24264,7 @@ def _set_name(name, _nameserialize, object):
 
 @functools.lru_cache()
 def _screen_dimensions():
-    if PythonInExcel:
+    if (PythonInExcel or AnacondaCode):
         return 1024, 768
     if Pythonista:
         screen_width, screen_height = ui.get_screen_size()
@@ -26279,7 +26280,7 @@ def _std_fonts():
 
 
 def fonts():
-    if PythonInExcel:
+    if (PythonInExcel or AnacondaCode):
         return []
     if not hasattr(fonts, "font_list"):
         fonts.font_list = []
@@ -26552,7 +26553,7 @@ def can_animate(try_only: bool = True) -> bool:
         except ImportError:
             ImageGrab = None
 
-        if not Pythonista and not PythonInExcel:
+        if not Pythonista and not (PythonInExcel or AnacondaCode):
             from PIL import ImageTk
     except ImportError:
         if try_only:
@@ -26561,7 +26562,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:
+    if not Pythonista and not (PythonInExcel or AnacondaCode):
         if PyDroid:
             if not g.tkinter_loaded:
                 if try_only:

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

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