pyscript-programming-language 1.12.10__tar.gz → 1.12.11__tar.gz

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.12.10
+Version: 1.12.11
 Summary: PyScript Programming Language
 Home-page: https://azzammuhyala.github.io/pyscript
 Author: azzammuhyala

pyscript_programming_language-1.12.11/changelog.md

@@ -0,0 +1,13 @@
+# Change Log
+
+## [1.12.11] - 11/04/2026
+
+### Added
+- New `-m` / `--module` argument.
+- _etc._
+
+### Fixed
+- Fixed some bugs.
+- Improved and added modules in `sys`.
+- Improved runtime interpreter.
+- _etc._

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/pyproject.toml

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

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/pyscript/__main__.py

@@ -12,8 +12,8 @@ from .core.highlight import (
 from .core.runner import _normalize_namespace, pys_runner, pys_shell
 from .core.utils.debug import USE_NOTEBOOK
 from .core.utils.generic import is_environ
-from .core.utils.module import remove_python_path
-from .core.utils.path import getcwd, normpath, get_name_from_path
+from .core.utils.module import find_module_path, remove_python_path
+from .core.utils.path import getcwd, base, normpath
 from .core.version import __version__
 
 if PYGMENTS:
@@ -52,7 +52,7 @@ for supported, name, class_editor in [
         EDITOR_MAP[name] = class_editor
 
 parser = ArgumentParser(
-    prog=f'{get_name_from_path(sys.executable)} -m pyscript',
+    prog=f'{base(sys.executable)} -m pyscript',
     description=f'PyScript Launcher for Python Version {".".join(map(str, sys.version_info))}'
 )
 
@@ -66,6 +66,7 @@ parser.add_argument(
     '-c', '--command',
     type=str,
     default=None,
+    metavar='STRING',
     help="execute program from a string argument",
 )
 
@@ -102,6 +103,14 @@ parser.add_argument(
     help="generate highlight code from a 'file'"
 )
 
+parser.add_argument(
+    '-m', '--module',
+    type=str,
+    default=None,
+    metavar='NAME',
+    help="run library module as a script"
+)
+
 parser.add_argument(
     '-n', '--no-color',
     action='store_true',
@@ -118,6 +127,7 @@ parser.add_argument(
     '-r', '--py-recursion',
     type=int,
     default=None,
+    metavar='UINTEGER',
     help="set a Python recursion limit"
 )
 
@@ -169,11 +179,16 @@ file_idx = sum(1 for arg in argv if arg.startswith('-'))
 end_idx  = argv.index('--', 0, file_idx) if '--' in argv[:file_idx] else -1
 end_com  = file_idx if end_idx == -1 else end_idx
 arg_com  = argv[:end_com]
+
 com_idx  = argv.index('-c', 0, end_com)        if '-c'        in arg_com else \
           (argv.index('--command', 0, end_com) if '--command' in arg_com else -1)
+mod_idx  = argv.index('-m', 0, end_com)        if '-m'        in arg_com else \
+          (argv.index('--module', 0, end_com)  if '--module'  in arg_com else -1)
+
+ofs_idx = max(com_idx, mod_idx)
 
-args = parser.parse_args(argv if com_idx == -1 else argv[:com_idx + 2])
-arg  = args.arg if com_idx == -1 else argv[com_idx + 2:]
+args = parser.parse_args(argv if ofs_idx == -1 else argv[:ofs_idx + 2])
+arg  = args.arg if ofs_idx == -1 else argv[ofs_idx + 2:]
 
 if args.terminal:
 
@@ -238,8 +253,8 @@ try:
     del (
         ENV_PYSCRIPT_NO_COLOR_PROMPT, ENV_PYSCRIPT_CLASSIC_LINE_SHELL, DEFAULT, DEBUG, CLASSIC_LINE_SHELL,
         NO_COLOR_PROMPT, NOTEBOOK, GUI_SUPPORT, TERMINAL_SUPPORT, PYGMENTS, HLFMT_ANSI, HLFMT_HTML, HLFMT_BBCODE,
-        USE_NOTEBOOK, OPTIONAL, REMAINDER, file_idx, end_idx, end_com, arg_com, com_idx, arg, pys_sys, __version__,
-        is_environ, remove_python_path, getcwd, get_name_from_path, PysGUIEditor, PysTerminalEditor, ArgumentParser
+        USE_NOTEBOOK, OPTIONAL, REMAINDER, file_idx, end_idx, end_com, arg_com, com_idx, mod_idx, ofs_idx, arg, pys_sys,
+        __version__, is_environ, remove_python_path, getcwd, base, PysGUIEditor, PysTerminalEditor, ArgumentParser
     )
 
     del (
@@ -248,30 +263,56 @@ try:
 except:
     pass
 
-if args.file is not None:
-    argv[0] = args.file
-    path = normpath(args.file)
-
+def load_file(path):
+    file = PysFileBuffer('', path)
     try:
         with open(path, 'r', encoding='utf-8') as file:
             file = PysFileBuffer(file, path)
     except FileNotFoundError:
-        if EDITOR_MAP and args.editor:
-            file = PysFileBuffer('', path)
-        else:
-            parser.error(f"can't open file {path!r}: No such file or directory")
+        if not (EDITOR_MAP and args.editor):
+            argument_error('file', f"can't open file \"{path}\": No such file or directory")
     except PermissionError:
-        parser.error(f"can't open file {path!r}: Permission denied")
+        argument_error('file', f"can't open file \"{path}\": Permission denied")
     except IsADirectoryError:
-        parser.error(f"can't open file {path!r}: Path is not a file")
+        argument_error('file', f"can't open file \"{path}\": Path is not a file")
     except NotADirectoryError:
-        parser.error(f"can't open file {path!r}: Attempting to access directory from file")
+        argument_error('file', f"can't open file \"{path}\": Attempting to access directory from file")
     except (OSError, IOError):
-        parser.error(f"can't open file {path!r}: Attempting to access a system directory or file")
+        argument_error('file', f"can't open file \"{path}\": Attempting to access a system directory or file")
     except UnicodeDecodeError:
-        parser.error(f"can't read file {path!r}: Bad file")
+        argument_error('file', f"can't read file \"{path}\": Bad file")
     except BaseException as e:
-        parser.error(f"file {path!r}: Unexpected error: {e}")
+        argument_error('file', f"file \"{path}\": Unexpected error: {e}")
+    return file
+
+def execute(file):
+    result = pys_runner(
+        file=file,
+        mode='exec',
+        symbol_table=_normalize_namespace(undefined, file),
+        flags=flags
+    )
+
+    code, _ = result.end_process()
+
+    if args.inspect:
+        if sys.stdout.closed or sys.stderr.closed:
+            return 1
+        elif sys.stdin.closed:
+            print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
+            return 1
+        else:
+            return pys_shell(
+                globals=result.context.symbol_table,
+                flags=result.context.flags | DONT_SHOW_BANNER_ON_SHELL,
+                parser_flags=result.parser_flags
+            )
+
+    return code
+
+if args.file is not None:
+    argv[0] = args.file
+    file = load_file(normpath(args.file))
 
     if EDITOR_MAP and args.editor:
         try:
@@ -300,53 +341,20 @@ if args.file is not None:
             argument_error('-l/--highlight', e)
 
     else:
-        result = pys_runner(
-            file=file,
-            mode='exec',
-            symbol_table=_normalize_namespace(undefined, file),
-            flags=flags
-        )
+        code = execute(file)
 
-        code, _ = result.end_process()
+elif args.module is not None:
+    _, module_path = find_module_path(None, args.module, '__main__')
+    if module_path is None:
+        argument_error('-m/--module', f"can't find module \"{args.module}\"")
 
-        if args.inspect:
-            if sys.stdout.closed or sys.stderr.closed:
-                code = 1
-            elif sys.stdin.closed:
-                print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
-                code = 1
-            else:
-                code = pys_shell(
-                    globals=result.context.symbol_table,
-                    flags=result.context.flags | DONT_SHOW_BANNER_ON_SHELL,
-                    parser_flags=result.parser_flags
-                )
+    file = load_file(module_path)
+    argv[0] = file.name
+    code = execute(file)
 
 elif args.command is not None:
     argv[0] = '-c'
-
-    file = PysFileBuffer(args.command, '<arg-command>')
-    result = pys_runner(
-        file=file,
-        mode='exec',
-        symbol_table=_normalize_namespace(undefined, file),
-        flags=flags
-    )
-
-    code, _ = result.end_process()
-
-    if args.inspect:
-        if sys.stdout.closed or sys.stderr.closed:
-            code = 1
-        elif sys.stdin.closed:
-            print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
-            code = 1
-        else:
-            code = pys_shell(
-                globals=result.context.symbol_table,
-                flags=result.context.flags | DONT_SHOW_BANNER_ON_SHELL,
-                parser_flags=result.parser_flags
-            )
+    code = execute(PysFileBuffer(args.command, '<arg-command>'))
 
 else:
     code = pys_shell(

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/pyscript/core/cache.py

@@ -17,40 +17,31 @@ pys_sys = ModuleType(
 
 pys_sys.__running_shell__ = False
 pys_sys.__running_breakpoint__ = False
+pys_sys.path = [SITE_PACKAGES_PATH, LIBRARIES_PATH]
+pys_sys.loading_modules = set()
+pys_sys.modules = {}
+pys_sys.singletons = {}
 pys_sys.argv = ['']
 pys_sys.flags = DEFAULT
 pys_sys.displayhook = print_display
 pys_sys.excepthook = print_traceback
 pys_sys.clearhook = clear_shell
-pys_sys.exec_prefix = pys_sys.prefix = pys_sys.pyscript_path = PYSCRIPT_PATH
+pys_sys.pyscript_path = PYSCRIPT_PATH
 pys_sys.core_path = CORE_PATH
 pys_sys.libraries_path = LIBRARIES_PATH
 pys_sys.site_packages_path = SITE_PACKAGES_PATH
 pys_sys.executable = f'"{sys.executable}" -m pyscript'
 pys_sys.ps1 = '>>> '
 pys_sys.ps2 = '... '
-pys_sys.float_info = sys.float_info
-pys_sys.int_info = sys.int_info
-pys_sys.hash_info = sys.hash_info
-pys_sys.stderr = sys.stderr
-pys_sys.stdout = sys.stdout
-pys_sys.stdin = sys.stdin
-pys_sys.platform = sys.platform
-pys_sys.exit = sys.exit
-pys_sys.getrecursionlimit = sys.getrecursionlimit
-pys_sys.getrefcount = sys.getrefcount
-pys_sys.getsizeof = sys.getsizeof
-pys_sys.setrecursionlimit = sys.setrecursionlimit
-
-# added in python>=3.10.7
-if hasattr(sys, 'get_int_max_str_digits') and hasattr(sys, 'set_int_max_str_digits'):
-    pys_sys.get_int_max_str_digits = sys.get_int_max_str_digits
-    pys_sys.set_int_max_str_digits = sys.set_int_max_str_digits
 
-pys_sys.path = [SITE_PACKAGES_PATH, LIBRARIES_PATH]
-pys_sys.loading_modules = set()
-pys_sys.modules = {}
-pys_sys.singletons = {}
+for name in (
+    'exit', 'float_info', 'float_repr_style', 'get_int_max_str_digits', 'getdefaultencoding',
+    'getfilesystemencodeerrors', 'getfilesystemencoding', 'getrecursionlimit', 'getrefcount', 'getsizeof',
+    'gettotalrefcount', 'hash_info', 'hexversion', 'int_info', 'intern', 'maxsize', 'maxunicode', 'platform',
+    'set_int_max_str_digits', 'setrecursionlimit', 'stderr', 'stdin', 'stdout', 'thread_info'
+):
+    if hasattr(sys, name):
+        setattr(pys_sys, name, getattr(sys, name))
 
 @singleton
 @inheritable

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/pyscript/core/editor/gui.py

@@ -89,6 +89,9 @@ try:
                 yscrollcommand=self.scrollbar.set
             )
 
+            self.scrollbar.pack_configure(side='right', fill='y')
+            self.scrollbar.configure(command=self.text.yview)
+
             self.text.pack_configure(side='left', expand=True, fill='both')
 
             self.text.insert('1.0', self.file.text)
@@ -99,9 +102,6 @@ try:
             self.text.bind('<Prior>', on_page_up)
             self.text.bind('<Next>', on_page_down)
 
-            self.scrollbar.pack_configure(side='right', fill='y')
-            self.scrollbar.configure(command=self.text.yview)
-
             self.bind_all('<Control-S>', on_save)
             self.bind_all('<Control-s>', on_save)
             self.bind_all('<Control-W>', on_toggle_wrap)
@@ -111,6 +111,8 @@ try:
             self.bind_all('<Control-equal>', on_change_font(1, lambda size : size < 128))
             self.bind_all('<Control-plus>', on_change_font(5, lambda size : size < 128))
 
+            # self.wm_geometry('800x600')
+            self.wm_minsize(300, 250)
             self.wm_protocol('WM_DELETE_WINDOW', on_close)
 
             if colored:

{pyscript_programming_language-1.12.10 → pyscript_programming_language-1.12.11}/pyscript/core/exceptions.py

@@ -24,6 +24,12 @@ class PysTraceback(Pys):
         primary: Optional['PysTraceback'] = None,
         implicit: bool = False
     ) -> None:
+        # circular import problem solved
+        from .cache import pys_sys
+
+        pys_sys.last_type = type(exception) if isinstance(exception, BaseException) else exception
+        pys_sys.last_value = exception if isinstance(exception, BaseException) else None
+        pys_sys.last_traceback = self
 
         setimuattr(self, 'exception', exception)
         setimuattr(self, 'context', context)
@@ -32,7 +38,7 @@ class PysTraceback(Pys):
         setimuattr(self, 'implicit', implicit)
 
     def __repr__(self) -> str:
-        return f'<traceback of exception {self.exception!r}>'
+        return f'<traceback of {self.exception!r}>'
 
     def string_traceback(self) -> str:
         # circular import problem solved
@@ -60,9 +66,9 @@ class PysTraceback(Pys):
 
             frames.append(
                 f'  File {magenta}"{position.file.name}"{reset}' +
-                ('' if is_positionless else f', line {magenta}{position.start_line}{reset}') + 
+                ('' if is_positionless      else f', line {magenta}{position.start_line}{reset}') + 
                 ('' if context_name is None else f', in {magenta}{context_name}{reset}') +
-                ('' if is_positionless else f'\n{indent(format_error_arrow(position, colored), 4)}')
+                ('' if is_positionless      else f'\n{indent(format_error_arrow(position, colored), 4)}')
             )
 
             position = context.parent_entry_position