pyscript-programming-language 1.15.1__tar.gz → 1.15.2__tar.gz

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.15.1
+Version: 1.15.2
 Summary: PyScript Programming Language
 Home-page: https://azzammuhyala.github.io/pyscript
 Author: AzzamMuhyala
@@ -69,8 +69,8 @@ Try [PyScript Shell (_REPL_)](https://azzammuhyala.github.io/pyscript/shell.html
 (no installation required).
 
 ## Installation ⬇️
-First, you'll need to download Python. Make sure you're using the latest version above `3.10`, to ensure the code runs
-correctly. Visit the official [Python website](https://python.org) to download it.
+First, you'll need to download Python. Make sure you're using the latest version **above `3.10`**, to ensure the code
+runs correctly. Visit the official [Python website](https://python.org) to download it.
 
 Next, after downloading and configuring the Python application, you can download the PyScript from
 [PyScript releases](https://github.com/azzammuhyala/pyscript/releases) or from PIP with this command (_Recommended_):
@@ -119,11 +119,12 @@ Familiar? There it is!
 | 14 | `os`              | **required**           |
 | 15 | `pkgutil`         | **required**           |
 | 16 | `re`              | **required**           |
-| 17 | `subprocess`      | **required**           |
-| 18 | `sys`             | **required**           |
-| 19 | `types`           | **required**           |
-| 20 | `typing`          | **required**           |
-| 21 | `unicodedata`     | **required**           |
+| 17 | `site`            | **required**           |
+| 18 | `subprocess`      | **required**           |
+| 19 | `sys`             | **required**           |
+| 20 | `types`           | **required**           |
+| 21 | `typing`          | **required**           |
+| 22 | `unicodedata`     | **required**           |
 | 1  | `ast`             | **required (library)** |
 | 2  | `math`            | **required (library)** |
 | 3  | `msvcrt`          | **required (library)** |

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/README.md

@@ -37,8 +37,8 @@ Try [PyScript Shell (_REPL_)](https://azzammuhyala.github.io/pyscript/shell.html
 (no installation required).
 
 ## Installation ⬇️
-First, you'll need to download Python. Make sure you're using the latest version above `3.10`, to ensure the code runs
-correctly. Visit the official [Python website](https://python.org) to download it.
+First, you'll need to download Python. Make sure you're using the latest version **above `3.10`**, to ensure the code
+runs correctly. Visit the official [Python website](https://python.org) to download it.
 
 Next, after downloading and configuring the Python application, you can download the PyScript from
 [PyScript releases](https://github.com/azzammuhyala/pyscript/releases) or from PIP with this command (_Recommended_):
@@ -87,11 +87,12 @@ Familiar? There it is!
 | 14 | `os`              | **required**           |
 | 15 | `pkgutil`         | **required**           |
 | 16 | `re`              | **required**           |
-| 17 | `subprocess`      | **required**           |
-| 18 | `sys`             | **required**           |
-| 19 | `types`           | **required**           |
-| 20 | `typing`          | **required**           |
-| 21 | `unicodedata`     | **required**           |
+| 17 | `site`            | **required**           |
+| 18 | `subprocess`      | **required**           |
+| 19 | `sys`             | **required**           |
+| 20 | `types`           | **required**           |
+| 21 | `typing`          | **required**           |
+| 22 | `unicodedata`     | **required**           |
 | 1  | `ast`             | **required (library)** |
 | 2  | `math`            | **required (library)** |
 | 3  | `msvcrt`          | **required (library)** |

pyscript_programming_language-1.15.2/changelog.md

@@ -0,0 +1,16 @@
+# Change Logs
+
+## [1.15.2] - 08/11/2026
+
+### Added
+- Site packages have been moved to `site.getusersitepackages()` within the `pyscript` folder.
+- The body of a `switch` statement can use semicolons `;`.
+- Optimizations applied to several nodes.
+- `getch` library includes the function `getch.is_initialized()`.
+- `site` library includes the function `site.getusersitepackages()`.
+- Added support for conversion to `complex` types in the `dual` library.
+- Added the `make_dirs` parameter to the `newfile`, `move`, and `copy` functions in the `explorer` library.
+
+### Fixed
+- Fixed several bugs.
+- _etc._

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyscript-programming-language"
-version = "1.15.1"
+version = "1.15.2"
 description = "PyScript Programming Language"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/__main__.py

@@ -139,7 +139,7 @@ parser.add_argument(
 parser.add_argument(
     '-t', '--terminal',
     action='store_true',
-    help="configure terminal encoding to UTF-8 and enable ANSI escape code processing on Windows"
+    help=f"configure terminal encoding to {pys_sys.encoding} and enable ANSI escape code processing on Windows"
 )
 
 parser.add_argument(
@@ -216,7 +216,7 @@ if args.terminal:
 
     for fd in (sys.stdout, sys.stderr, sys.stdin):
         try:
-            fd.reconfigure(encoding='utf-8')
+            fd.reconfigure(encoding=pys_sys.encoding)
         except:
             continue
 

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/constants.py

@@ -1,10 +1,11 @@
 import os
+import site
 
 PYSCRIPT_PATH = os.path.sep.join(__file__.split(os.path.sep)[:-2])
 CORE_PATH = os.path.join(PYSCRIPT_PATH, 'core')
 LIBRARIES_PATH = os.path.join(PYSCRIPT_PATH, 'lib')
 OTHER_PATH = os.path.join(PYSCRIPT_PATH, 'other')
-SITE_PACKAGES_PATH = os.path.join(PYSCRIPT_PATH, 'site-packages')
+SITE_PACKAGES_PATH = os.path.join(site.getusersitepackages(), 'pyscript')
 ICON_PATH = os.path.join(OTHER_PATH, 'PyScript.ico')
 GLOBAL_HISTORY_PATH = os.path.join(os.path.expanduser('~'), '.pyscript_history')
 CONFIGURATIONS_PATH = os.path.join(OTHER_PATH, 'configurations.json')

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/handlers.py

@@ -1,15 +1,27 @@
 from .cache import pys_sys
-from .constants import ENV_PYSCRIPT_WITH_GIL
+from .constants import SITE_PACKAGES_PATH, ENV_PYSCRIPT_WITH_GIL
 from .context import PysContext
 from .position import PysPosition
 from .pystypes import PysFunction
 from .utils.generic import is_environ
 
+from site import ENABLE_USER_SITE
 from types import MethodType
 from typing import Any
 
+import os
+
 wrapper_function = (MethodType, classmethod, staticmethod)
 
+if ENABLE_USER_SITE:
+    try:
+        if os.path.isfile(SITE_PACKAGES_PATH):
+            os.remove(SITE_PACKAGES_PATH)
+        if not os.path.exists(SITE_PACKAGES_PATH):
+            os.mkdir(SITE_PACKAGES_PATH)
+    except:
+        pass
+
 GIL = pys_sys.gil = False
 if is_environ(ENV_PYSCRIPT_WITH_GIL):
     try:

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/highlight.py

@@ -28,7 +28,6 @@ BUILTIN_FUNCTIONS = frozenset(
 )
 
 try:
-    # if pygments module already exists
     from pygments.lexer import RegexLexer, include, bygroups
     from pygments.style import Style
     from pygments.token import (

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/interpreter.py

@@ -308,17 +308,19 @@ def visit_BinaryOperatorNode(node: PysBinaryOperatorNode, context: PysContext) -
     result._context = context
     result._position = node.position
     with result:
-        return_right = True
 
         if otype == T_OR:
             if left:
                 return result.success(left)
+            return_right = True
         elif otype == T_AND:
             if not left:
                 return result.success(left)
+            return_right = True
         elif otype == T_NULLISH:
             if left is not None:
                 return result.success(left)
+            return_right = True
         else:
             return_right = False
 
@@ -595,13 +597,13 @@ def visit_MatchNode(node: PysMatchNode, context: PysContext) -> PysRunTimeResult
     should_return = result.should_return
     ntarget = node.target
 
-    compare = False
-
     if ntarget:
         target = register(get_visitor(ntarget.__class__)(ntarget, context))
         if should_return():
             return result
         compare = True
+    else:
+        compare = False
 
     for ncondition, nvalue in node.cases:
         condition = register(get_visitor(ncondition.__class__)(ncondition, context))
@@ -611,7 +613,7 @@ def visit_MatchNode(node: PysMatchNode, context: PysContext) -> PysRunTimeResult
         result._position = ncondition.position
         with result:
 
-            if target == condition if compare else (True if condition else False):
+            if (target == condition) if compare else condition:
                 value = register(get_visitor(nvalue.__class__)(nvalue, context))
                 if should_return():
                     return result
@@ -654,7 +656,6 @@ def visit_TryNode(node: PysTryNode, context: PysContext) -> PysRunTimeResult:
         failure(None)
 
         for (targets, tparameter), body in node.catches:
-            handle_exception = True
             stop = False
 
             if targets:
@@ -683,6 +684,9 @@ def visit_TryNode(node: PysTryNode, context: PysContext) -> PysRunTimeResult:
                         handle_exception = True
                         break
 
+            else:
+                handle_exception = True
+
             if stop:
                 break
 

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/nodes.py

@@ -274,6 +274,7 @@ class PysTernaryOperatorNode(PysNode):
         invalid: PysNode,
         style: Literal['general', 'pythonic']
     ) -> 'PysTernaryOperatorNode | PysNode':
+
         if (l_condition := _get_literal_value(condition)) is not undefined:
             return valid if l_condition else invalid
 
@@ -398,17 +399,15 @@ class PysStatementsNode(PysNode):
             return elements[0]
 
         new = []
-        constant_nodes = {PysConstantNode, PysDebugNode, PysEllipsisNode}
-        interrupt_nodes = {PysReturnNode, PysThrowNode, PysContinueNode, PysBreakNode}
 
         for node in elements:
-            if node.__class__ in constant_nodes:
+            if node.__class__ in _constant_nodes:
                 continue
             elif node.__class__ is PysStatementsNode:
                 new.extend(node.elements)
             else:
                 new.append(node)
-            if node.__class__ in interrupt_nodes:
+            if node.__class__ in _interrupt_nodes:
                 break
 
         self = super().__new__(cls, position)
@@ -510,12 +509,16 @@ class PysSwitchNode(PysNode):
         target: PysNode,
         cases: list[tuple[PysNode, PysNode]],
         default: PysNode | None
-    ) -> 'PysSwitchNode':
+    ) -> 'PysSwitchNode | PysNode':
+        default = _optional_part(default)
+
+        if not (cases or default):
+            return target
 
         self = super().__new__(cls, position)
         setimuattr(self, 'target', target)
         setimuattr(self, 'cases', tuple(cases))
-        setimuattr(self, 'default', _optional_part(default))
+        setimuattr(self, 'default', default)
         return self
 
     def __repr__(self) -> str:
@@ -532,12 +535,31 @@ class PysMatchNode(PysNode):
         target: PysNode | None,
         cases: list[tuple[PysNode, PysNode]],
         default: PysNode | None
-    ) -> 'PysMatchNode':
+    ) -> 'PysMatchNode | PysNode':
+
+        if target and (l_target := _get_literal_value(target)) is not undefined:
+            new_cases = []
+
+            for condition, value in cases:
+                if (l_condition := _get_literal_value(condition)) is undefined:
+                    new_cases.append((condition, value))
+                elif l_target == l_condition:
+                    default = value
+                    break
+
+            cases = new_cases
+            default = _optional_part(default, expression=True)
+
+            if not cases:
+                return default if default else PysConstantNode(position, None)
+
+        else:
+            default = _optional_part(default, expression=True)
 
         self = super().__new__(cls, position)
         setimuattr(self, 'target', target)
         setimuattr(self, 'cases', tuple(cases))
-        setimuattr(self, 'default', _optional_part(default))
+        setimuattr(self, 'default', default)
         return self
 
     def __repr__(self) -> str:
@@ -602,8 +624,7 @@ class PysForNode(PysNode):
     def __new__(
         cls,
         position: PysPosition,
-        header: tuple[PysNode | None, PysNode | None, PysNode | None] |
-                tuple[PysNode, PysNode],
+        header: tuple[PysNode | None, PysNode | None, PysNode | None] | tuple[PysNode, PysNode],
         body: PysNode,
         else_: PysNode | None
     ) -> 'PysForNode':
@@ -628,12 +649,16 @@ class PysWhileNode(PysNode):
         condition: PysNode,
         body: PysNode,
         else_: PysNode | None
-    ) -> 'PysWhileNode':
+    ) -> 'PysWhileNode | PysNode':
+        else_ = _optional_part(else_)
+
+        if (l_condition := _get_literal_value(condition)) is not undefined and not l_condition:
+            return else_ if else_ else PysStatementsNode(position, [])
 
         self = super().__new__(cls, position)
         setimuattr(self, 'condition', condition)
         setimuattr(self, 'body', body)
-        setimuattr(self, 'else_', _optional_part(else_))
+        setimuattr(self, 'else_', else_)
         return self
 
     def __repr__(self) -> str:
@@ -770,7 +795,7 @@ class PysReturnNode(PysNode):
     @typecheck
     def __new__(cls, position: PysPosition, value: PysNode | None) -> 'PysReturnNode':
         self = super().__new__(cls, position)
-        setimuattr(self, 'value', _optional_part(value))
+        setimuattr(self, 'value', _optional_part(value, expression=True))
         return self
 
     def __repr__(self) -> str:
@@ -855,6 +880,9 @@ class PysBreakNode(PysNode):
     def __repr__(self) -> Literal['Break()']:
         return 'Break()'
 
+_constant_nodes = frozenset([PysConstantNode, PysDebugNode, PysEllipsisNode])
+_interrupt_nodes = frozenset([PysReturnNode, PysThrowNode, PysContinueNode, PysBreakNode])
+
 def _get_literal_value(item: Any) -> Any | PysUndefined:
 
     if isinstance(item, (PysConstantNode, PysToken)):
@@ -886,9 +914,9 @@ def _get_literal_value(item: Any) -> Any | PysUndefined:
 
     return undefined
 
-def _optional_part(part: PysNode | None) -> PysNode | None:
+def _optional_part(part: PysNode | None, *, expression: bool = False) -> PysNode | None:
     return None if (
+        (not expression and part.__class__ in _constant_nodes) or
         _get_literal_value(part) is None or
-        (part.__class__ is PysStatementsNode and not part.elements) or
-        (part.__class__ in (PysDebugNode, PysEllipsisNode))
+        (part.__class__ is PysStatementsNode and not part.elements)
     ) else part

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/parser.py

@@ -1197,66 +1197,71 @@ class PysParser(Pys):
 
         self.skip(result)
 
-        if self.current_token.type != TOKENS['LEFT_CURLY']:
-            return result.failure(self.new_error("expected '{'"))
+        cases = []
+        default = None
 
-        left_bracket_token = self.current_token
+        if self.current_token.type == TOKENS['SEMICOLON']:
+            result.register_advancement()
+            self.advance()
 
-        result.register_advancement()
-        self.advance()
-        self.skip(result)
+        elif self.current_token.type == TOKENS['LEFT_CURLY']:
+            left_bracket_token = self.current_token
 
-        cases = []
-        default = None
+            result.register_advancement()
+            self.advance()
+            self.skip(result)
 
-        while True:
+            while True:
 
-            if self.current_token.match(TOKENS['KEYWORD'], 'case'):
-                result.register_advancement()
-                self.advance()
-                self.skip(result)
+                if self.current_token.match(TOKENS['KEYWORD'], 'case'):
+                    result.register_advancement()
+                    self.advance()
+                    self.skip(result)
 
-                case = result.register(self.walrus(), True)
-                if result.error:
-                    return result
+                    case = result.register(self.walrus(), True)
+                    if result.error:
+                        return result
 
-                self.skip(result)
+                    self.skip(result)
 
-                if self.current_token.type != TOKENS['COLON']:
-                    return result.failure(self.new_error("expected ':'"))
+                    if self.current_token.type != TOKENS['COLON']:
+                        return result.failure(self.new_error("expected ':'"))
 
-                result.register_advancement()
-                self.advance()
+                    result.register_advancement()
+                    self.advance()
 
-                body = result.register(self.statements())
-                if result.error:
-                    return result
+                    body = result.register(self.statements())
+                    if result.error:
+                        return result
 
-                cases.append((case, body))
+                    cases.append((case, body))
 
-            elif self.current_token.match(TOKENS['KEYWORD'], 'default', 'else'):
-                result.register_advancement()
-                self.advance()
-                self.skip(result)
+                elif self.current_token.match(TOKENS['KEYWORD'], 'default', 'else'):
+                    result.register_advancement()
+                    self.advance()
+                    self.skip(result)
 
-                if self.current_token.type != TOKENS['COLON']:
-                    return result.failure(self.new_error("expected ':'"))
+                    if self.current_token.type != TOKENS['COLON']:
+                        return result.failure(self.new_error("expected ':'"))
 
-                result.register_advancement()
-                self.advance()
+                    result.register_advancement()
+                    self.advance()
 
-                default = result.register(self.statements())
-                if result.error:
-                    return result
+                    default = result.register(self.statements())
+                    if result.error:
+                        return result
 
-                break
+                    break
 
-            else:
-                break
+                else:
+                    break
 
-        self.close_bracket(result, left_bracket_token)
-        if result.error:
-            return result
+            self.close_bracket(result, left_bracket_token)
+            if result.error:
+                return result
+
+        else:
+            return result.failure(self.new_error("expected '{'"))
 
         return result.success(
             PysSwitchNode(

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/pysbuiltins.py

@@ -461,7 +461,8 @@ def ce(context, position, a, b, *, rel_tol=1e-9, abs_tol=0):
     abs_tol: maximum difference for being considered "close", regardless of the magnitude of the input values.
     """
 
-    if isinstance(a, real_complex_number) and isinstance(b, real_complex_number):
+    b_isinstance = isinstance
+    if b_isinstance(a, real_complex_number) and b_isinstance(b, real_complex_number):
         return isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol)
 
     result = _magic_method(context, position, a, '__ce__', b, rel_tol=rel_tol, abs_tol=abs_tol)
@@ -495,7 +496,8 @@ def nce(context, position, a, b, *, rel_tol=1e-9, abs_tol=0):
     abs_tol: maximum difference for being considered "close", regardless of the magnitude of the input values.
     """
 
-    if isinstance(a, real_complex_number) and isinstance(b, real_complex_number):
+    b_isinstance = isinstance
+    if b_isinstance(a, real_complex_number) and b_isinstance(b, real_complex_number):
         return not isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol)
 
     result = _magic_method(context, position, a, '__nce__', b, rel_tol=rel_tol, abs_tol=abs_tol)
@@ -526,9 +528,10 @@ def increment(context, position, object):
     __increment__ method, which if unsuccessful will throw a TypeError.
     """
 
-    if isinstance(object, real_number):
+    b_isinstance = isinstance
+    if b_isinstance(object, real_number):
         return object + 1
-    elif isinstance(object, sequence):
+    elif b_isinstance(object, sequence):
         return tuple(_pyincrement(context, position, obj) for obj in object)
 
     result = _magic_method(context, position, object, '__increment__')
@@ -550,9 +553,10 @@ def decrement(context, position, object):
     call the __decrement__ method, which if unsuccessful will throw a TypeError.
     """
 
-    if isinstance(object, real_number):
+    b_isinstance = isinstance
+    if b_isinstance(object, real_number):
         return object - 1
-    elif isinstance(object, sequence):
+    elif b_isinstance(object, sequence):
         return tuple(_pydecrement(context, position, obj) for obj in object)
 
     result = _magic_method(context, position, object, '__decrement__')

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/pystypes.py

@@ -11,7 +11,6 @@ from .utils.generic import setimuattr, dinit, drepr, dor, dror, dior, dsetitem,
 from .utils.similarity import diff_get_closest
 from .utils.string import join
 
-from builtins import help as pyhelp
 from itertools import islice
 from types import MethodType
 from typing import Any, Callable, Optional
@@ -311,10 +310,16 @@ class PysPrinter(PysObject):
 
 class PysHelper(PysPrinter):
 
-    __slots__ = ()
+    __slots__ = ('_pyhelp',)
 
     def __init__(self) -> None:
         super().__init__('help')
+        try:
+            from builtins import help
+        except:
+            def help(*args, **kwargs):
+                raise NotImplementedError('python builtins.help not found')
+        setimuattr(self, '_pyhelp', help)
 
     def __repr__(self) -> str:
         return f'Type {self.name}() for interactive help, or {self.name}(object) for help about object.'
@@ -328,4 +333,4 @@ class PysHelper(PysPrinter):
                 "To get the list of builtin functions, types, exceptions, and other objects, type 'help(\"builtins\")'."
             )
         else:
-            pyhelp(*args, **kwargs)
+            self._pyhelp(*args, **kwargs)

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/shell.py

@@ -233,10 +233,8 @@ try:
     @singleton
     class PysHistory(Pys, History):
 
-        def __new_singleton__(cls) -> 'PysHistory':
-            if USE_FILE_HISTORY:
-                return super().__new__(cls)
-            raise NotImplementedError('not using file history')
+        def __new_singleton__(cls) -> 'PysHistory | InMemoryHistory':
+            return super().__new__(cls) if USE_FILE_HISTORY else InMemoryHistory()
 
         def _write_history_safely(self, mode: str, function: str, *args) -> None:
             try:
@@ -254,16 +252,16 @@ try:
                 self._write_history_safely('w', 'write', '')
                 return []
 
-            try:
-                strings = []
-                lines = []
+            strings = []
+            lines = []
 
-                def add_to_string():
-                    if not lines:
-                        return
-                    strings.insert(0, '\n'.join(lines))
-                    lines.clear()
+            def add_to_string():
+                if not lines:
+                    return
+                strings.insert(0, '\n'.join(lines))
+                lines.clear()
 
+            try:
                 with open(HISTORY_PATH, 'r', encoding=pys_sys.encoding) as file:
                     for line in file:
                         line = line[:-1]
@@ -273,13 +271,15 @@ try:
                         lines.append(line)
                     add_to_string()
 
-                if HISTORY_LIMIT > 0 and len(strings) > HISTORY_LIMIT:
+                if 0 < HISTORY_LIMIT < len(strings):
                     self._manage_history_capacity(strings)
 
-                return strings
             except:
                 return []
 
+            else:
+                return strings
+
         # this function is called within `append_string()` which adds a new string or history entry to `_loaded_strings`
         # before invoking this function
         def store_string(self, string: str) -> None:
@@ -290,8 +290,6 @@ try:
             else:
                 self._manage_history_capacity(self._loaded_strings)
 
-    history = (PysHistory if USE_FILE_HISTORY else InMemoryHistory)()
-
     class PysPromptToolkitLineShell(PysLineShell, PromptSession):
 
         def __init__(self, ps1: str = '>>> ', ps2: str = '... ', colored: bool = True) -> None:
@@ -381,7 +379,7 @@ try:
                 input_processors=[TabsProcessor(tabstop=4)],
                 key_bindings=key_bindings,
                 prompt_continuation=lambda width, line_number, is_soft_wrap: self._ps2,
-                history=history,
+                history=PysHistory(),
                 **other_keyword
             )
 

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/utils/decorators.py

@@ -13,9 +13,10 @@ class _PysUtilities(Pys):
         # circular import problem solved
         from ..cache import pys_sys
         singletons = pys_sys.singletons
-        if type(singletons.get(cls, None)) is not cls:
-            singletons[cls] = cls.__new_singleton__(cls, *args, **kwargs)
-        return singletons[cls]
+        object = singletons.get(cls, None)
+        if type(object) is not cls:
+            singletons[cls] = object = cls.__new_singleton__(cls, *args, **kwargs)
+        return object
 
     @staticmethod
     def readonly_attribute(*args, **kwargs):

{pyscript_programming_language-1.15.1 → pyscript_programming_language-1.15.2}/pyscript/core/utils/string.py

@@ -43,8 +43,10 @@ def join(sequence: Sequence[str], conjunction: str = 'and') -> str:
     elif length == 1:
         return sequence[0]
     elif length == 2:
-        return f'{sequence[0]} {conjunction} {sequence[1]}'
-    return f'{", ".join(sequence[:-1])}, {conjunction} {sequence[-1]}'
+        a, b = sequence
+        return f'{a} {conjunction} {b}'
+    *others, end = sequence
+    return f'{", ".join(others)}, {conjunction} {end}'
 
 def indent(string: str, length: int, indent: str = ' ') -> str:
     prefix = indent * length