pyscript-programming-language 1.12.0__tar.gz → 1.12.1__tar.gz

{pyscript_programming_language-1.12.0/pyscript_programming_language.egg-info → pyscript_programming_language-1.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.12.0
+Version: 1.12.1
 Summary: PyScript Programming Language
 Home-page: https://azzammuhyala.github.io/pyscript
 Author: azzammuhyala
@@ -115,10 +115,10 @@ Familiar? There it is!
 | 5  | `time`            | **required (library)** |
 | 6  | `tty`             | **required (library)** |
 | 1  | `beartype`        | **optional**           |
-| 2  | `google.colab`    | **optional**           |
-| 3  | `prompt_toolkit`  | **optional**           |
-| 4  | `pygments`        | **optional**           |
-| 5  | `tkinter`         | **optional**           |
+| 2  | `prompt_toolkit`  | **optional**           |
+| 3  | `pygments`        | **optional**           |
+| 4  | `tkinter`         | **optional**           |
+| 5  | `IPython`         | **optional**           |
 
 ### Status Explanation
 - **required**: Required by PyScript entirely.

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/README.md

@@ -87,10 +87,10 @@ Familiar? There it is!
 | 5  | `time`            | **required (library)** |
 | 6  | `tty`             | **required (library)** |
 | 1  | `beartype`        | **optional**           |
-| 2  | `google.colab`    | **optional**           |
-| 3  | `prompt_toolkit`  | **optional**           |
-| 4  | `pygments`        | **optional**           |
-| 5  | `tkinter`         | **optional**           |
+| 2  | `prompt_toolkit`  | **optional**           |
+| 3  | `pygments`        | **optional**           |
+| 4  | `tkinter`         | **optional**           |
+| 5  | `IPython`         | **optional**           |
 
 ### Status Explanation
 - **required**: Required by PyScript entirely.

pyscript_programming_language-1.12.1/changelog.md

@@ -0,0 +1,16 @@
+# Change Log
+
+## [1.12.1] - 25/02/2026
+
+### Added
+- Auto indentation.
+- Token values ​​for types `NUMBER` and `STRING` in Lexer with `parser_flags=LEXER_HIGHLIGHT` produce a `tuple` object
+  with the value or representation and a conversion function.
+- The `NO_COLOR_PROMPT` and `NOTEBOOK` flags.
+- The `sys.get_int_max_str_digits` function.
+- _etc_.
+
+### Fixed
+- **Fixed some bugs**.
+- Fixed some spelling errors.
+- _etc._

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyproject.toml

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

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/__init__.py

@@ -9,8 +9,8 @@ if __import__('sys').version_info < (3, 10):
 from . import core
 
 from .core.constants import (
-    DEFAULT, NO_COLOR, DEBUG, SILENT, RETURN_RESULT, DONT_SHOW_BANNER_ON_SHELL, CLASSIC_LINE_SHELL, LEXER_HIGHLIGHT,
-    DICT_TO_JSDICT
+    DEFAULT, NO_COLOR, DEBUG, SILENT, RETURN_RESULT, DONT_SHOW_BANNER_ON_SHELL, CLASSIC_LINE_SHELL, NO_COLOR_PROMPT,
+    NOTEBOOK, LEXER_HIGHLIGHT, DICT_TO_JSDICT
 )
 from .core.cache import undefined
 from .core.highlight import (
@@ -29,6 +29,8 @@ __all__ = (
     'RETURN_RESULT',
     'DONT_SHOW_BANNER_ON_SHELL',
     'CLASSIC_LINE_SHELL',
+    'NO_COLOR_PROMPT',
+    'NOTEBOOK',
     'LEXER_HIGHLIGHT',
     'DICT_TO_JSDICT',
     'HLFMT_HTML',

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/__init__.pyi

@@ -27,6 +27,8 @@ SILENT: int
 RETURN_RESULT: int
 DONT_SHOW_BANNER_ON_SHELL: int
 CLASSIC_LINE_SHELL: int
+NO_COLOR_PROMPT: int
+NOTEBOOK: int
 LEXER_HIGHLIGHT: int
 DICT_TO_JSDICT: int
 

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/__main__.py

@@ -1,7 +1,8 @@
 from .core.buffer import PysFileBuffer
 from .core.cache import pys_sys, undefined
 from .core.constants import (
-    ENV_PYSCRIPT_CLASSIC_LINE_SHELL, DEFAULT, DEBUG, NO_COLOR, DONT_SHOW_BANNER_ON_SHELL, CLASSIC_LINE_SHELL
+    ENV_PYSCRIPT_NO_COLOR_PROMPT, ENV_PYSCRIPT_CLASSIC_LINE_SHELL, DEFAULT, DEBUG, NO_COLOR, DONT_SHOW_BANNER_ON_SHELL,
+    CLASSIC_LINE_SHELL, NO_COLOR_PROMPT, NOTEBOOK
 )
 from .core.editor.gui import PysGUIEditor, GUI_SUPPORT
 from .core.editor.terminal import PysTerminalEditor, TERMINAL_SUPPORT
@@ -9,6 +10,8 @@ from .core.highlight import (
     PYGMENTS, HLFMT_HTML, HLFMT_ANSI, HLFMT_BBCODE, pys_highlight, PygmentsPyScriptStyle, PygmentsPyScriptLexer
 )
 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.version import __version__
@@ -30,7 +33,6 @@ if PYGMENTS:
     }
 
 from argparse import OPTIONAL, REMAINDER, ArgumentParser
-from os import environ
 
 import sys
 
@@ -42,16 +44,24 @@ FORMAT_HIGHLIGHT_MAP = {
 
 EDITOR_MAP = {}
 
-if GUI_SUPPORT:
-    EDITOR_MAP['gui'] = PysGUIEditor
-if TERMINAL_SUPPORT:
-    EDITOR_MAP['terminal'] = PysTerminalEditor
+for supported, name, class_editor in [
+    (GUI_SUPPORT, 'gui', PysGUIEditor),
+    (TERMINAL_SUPPORT, 'terminal', PysTerminalEditor)
+]:
+    if supported:
+        EDITOR_MAP[name] = class_editor
 
 parser = ArgumentParser(
     prog=f'{get_name_from_path(sys.executable)} -m pyscript',
     description=f'PyScript Launcher for Python Version {".".join(map(str, sys.version_info))}'
 )
 
+parser.add_argument(
+    '-b', '--notebook',
+    action='store_true',
+    help="combination of -k and -p flags, suitable for notebook platforms such as IPython, Jupyter, Google Colab, etc"
+)
+
 parser.add_argument(
     '-c', '--command',
     type=str,
@@ -98,6 +108,12 @@ parser.add_argument(
     help="Suppress colored output"
 )
 
+parser.add_argument(
+    '-p', '--no-color-prompt',
+    action='store_true',
+    help="Suppress colored prompt output"
+)
+
 parser.add_argument(
     '-r', '--py-recursion',
     type=int,
@@ -140,7 +156,7 @@ parser.add_argument(
 parser.add_argument(
     'arg',
     nargs=REMAINDER,
-    help="Remaining arguments stored in sys_module.argv (sys.argv)"
+    help="Remaining arguments stored in pys_sys.argv (sys.argv)"
 )
 
 def argument_error(argument, message):
@@ -184,14 +200,17 @@ if args.py_recursion is not None:
 code = 0
 flags = DEFAULT
 
-if args.debug:
-    flags |= DEBUG
-if args.no_color or environ.get('NO_COLOR') is not None:
-    flags |= NO_COLOR
-if args.classic_line_shell or environ.get(ENV_PYSCRIPT_CLASSIC_LINE_SHELL) is not None:
-    flags |= CLASSIC_LINE_SHELL
-if args.q:
-    flags |= DONT_SHOW_BANNER_ON_SHELL
+for condition, flag in [
+    (args.notebook or USE_NOTEBOOK, NOTEBOOK),
+    (args.debug, DEBUG),
+    (args.classic_line_shell or is_environ(ENV_PYSCRIPT_CLASSIC_LINE_SHELL), CLASSIC_LINE_SHELL),
+    (args.no_color or is_environ('NO_COLOR'), NO_COLOR),
+    (args.no_color_prompt or is_environ(ENV_PYSCRIPT_NO_COLOR_PROMPT), NO_COLOR_PROMPT),
+    (args.q, DONT_SHOW_BANNER_ON_SHELL)
+]:
+    if condition:
+        flags |= flag
+
 if args.P:
     for cwd in {'', '.', getcwd()}:
         remove_python_path(cwd)

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/analyzer.py

@@ -432,8 +432,8 @@ class PysAnalyzer(Pys):
         if self.error:
             return
 
-        if node.cause:
-            self.visit(node.cause)
+        if node.primary:
+            self.visit(node.primary)
 
     def visit_AssertNode(self, node):
         self.visit(node.condition)

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/cache.py

@@ -18,6 +18,7 @@ pys_sys = ModuleType(
 pys_sys.__running_shell__ = False
 pys_sys.__running_breakpoint__ = False
 pys_sys.argv = ['']
+pys_sys.flags = 0
 pys_sys.displayhook = print_display
 pys_sys.excepthook = print_traceback
 pys_sys.clearhook = clear_shell
@@ -42,7 +43,8 @@ pys_sys.getsizeof = sys.getsizeof
 pys_sys.setrecursionlimit = sys.setrecursionlimit
 
 # added in python>=3.10.7
-if hasattr(sys, 'set_int_max_str_digits'):
+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]

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/constants.py

@@ -14,6 +14,7 @@ ENV_PYSCRIPT_NO_EXCEPTHOOK = 'PYSCRIPT_NO_EXCEPTHOOK'
 ENV_PYSCRIPT_NO_GIL = 'PYSCRIPT_NO_GIL'
 ENV_PYSCRIPT_NO_READLINE = 'PYSCRIPT_NO_READLINE'
 ENV_PYSCRIPT_NO_TYPECHECK = 'PYSCRIPT_NO_TYPECHECK'
+ENV_PYSCRIPT_NO_COLOR_PROMPT = 'PYSCRIPT_NO_COLOR_PROMPT'
 ENV_PYSCRIPT_MAXIMUM_TRACEBACK_LINE = 'PYSCRIPT_MAXIMUM_TRACEBACK_LINE'
 ENV_PYSCRIPT_CLASSIC_LINE_SHELL = 'PYSCRIPT_CLASSIC_LINE_SHELL'
 
@@ -117,6 +118,8 @@ SILENT = 1 << 2
 RETURN_RESULT = 1 << 3
 DONT_SHOW_BANNER_ON_SHELL = 1 << 4
 CLASSIC_LINE_SHELL = 1 << 5
+NO_COLOR_PROMPT = 1 << 6
+NOTEBOOK = CLASSIC_LINE_SHELL | NO_COLOR_PROMPT
 
 # parser flags
 LEXER_HIGHLIGHT = 1 << 0

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/editor/bases.py

@@ -8,8 +8,6 @@ from os.path import basename
 
 class PysEditor(Pys):
 
-    __slots__ = ('file', 'used', 'modified', 'wrapped', 'basename')
-
     @typechecked
     def __init__(self, file: PysFileBuffer) -> None:
         self.file = file
@@ -24,10 +22,15 @@ class PysEditor(Pys):
 
     def save(self, text) -> None:
         text = normstr(text)
-        with open(self.file.name, 'w', encoding='utf-8') as file:
-            file.write(text)
-            setimuattr(self.file, 'text', text)
-        self.modified = False
+        try:
+            print('saved')
+            with open(self.file.name, 'w', encoding='utf-8') as file:
+                file.write(text)
+                setimuattr(self.file, 'text', text)
+        except:
+            pass
+        else:
+            self.modified = False
 
     def run(self) -> None:
         if self.used:

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/editor/gui.py

@@ -20,13 +20,8 @@ try:
                 pass
 
             self.lexer = PygmentsPyScriptLexer()
-            self.style = PygmentsPyScriptStyle
-
             self.font = Font(family='Consolas', size=10)
-
             self.scrollbar = Scrollbar(self)
-            self.scrollbar.pack_configure(side='right', fill='y')
-
             self.text = Text(
                 self,
                 undo=True,
@@ -40,12 +35,15 @@ try:
             )
 
             self.text.pack_configure(side='left', expand=True, fill='both')
-            self.scrollbar.configure(command=self.text.yview)
 
             self.text.insert('1.0', self.file.text)
             self.text.edit_modified(False)
 
             self.text.bind('<<Modified>>', self.on_modified)
+            self.text.bind('<Return>', self.on_enter)
+
+            self.scrollbar.pack_configure(side='right', fill='y')
+            self.scrollbar.configure(command=self.text.yview)
 
             self.bind_all('<Control-S>', self.on_save)
             self.bind_all('<Control-s>', self.on_save)
@@ -59,15 +57,15 @@ try:
             self.protocol('WM_DELETE_WINDOW', self.on_close)
 
             self.setup_tags()
-            self.update()
 
         def run(self) -> None:
             PysEditor.run(self)
+            self.update()
             Tk.mainloop(self)
 
         def setup_tags(self):
             tag_configure = self.text.tag_configure
-            for token, style in self.style.list_styles():
+            for token, style in PygmentsPyScriptStyle.list_styles():
                 if color := style['color']:
                     tag_configure(str(token), foreground=f'#{color}')
 
@@ -129,9 +127,15 @@ try:
             self.text.configure(wrap='char' if self.wrapped else 'none')
             return 'break'
 
+        def on_enter(self, event=None):
+            text = self.text
+            line = text.get('insert linestart', 'insert lineend')
+            text.insert('insert', '\n' + line[:len(line) - len(line.lstrip())])
+            return 'break'
+
     GUI_SUPPORT = True
 
-except ImportError as e:
+except BaseException as e:
     _error = e
 
     class PysGUIEditor(PysEditor):

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/editor/terminal.py

@@ -8,7 +8,6 @@ try:
     from prompt_toolkit.filters import Condition
     from prompt_toolkit.formatted_text import ANSI
     from prompt_toolkit.key_binding import KeyBindings
-    from prompt_toolkit.keys import Keys
     from prompt_toolkit.layout import Layout, HSplit, Window, Float, FloatContainer
     from prompt_toolkit.layout.containers import ConditionalContainer
     from prompt_toolkit.layout.controls import FormattedTextControl
@@ -23,7 +22,6 @@ try:
             PysEditor.__init__(self, file)
 
             self.show_exit_window = False
-            self.overwrite = False
 
             on_edit = Condition(lambda: not self.show_exit_window)
             on_exit = Condition(lambda: self.show_exit_window)
@@ -53,39 +51,45 @@ try:
                 filter=on_exit,
             )
 
-            self.key_bindings = KeyBindings()
+            key_bindings = KeyBindings()
 
-            @self.key_bindings.add('tab', filter=on_edit, eager=True)
+            @key_bindings.add('tab', filter=on_edit, eager=True)
             def _(event):
                 self.text.buffer.insert_text('\t')
 
-            @self.key_bindings.add('insert', filter=on_edit, eager=True)
-            def _(event):
-                self.overwrite = not self.overwrite
-
-            @self.key_bindings.add('pageup', filter=on_edit, eager=True)
+            @key_bindings.add('pageup', filter=on_edit, eager=True)
             def _(event):
                 self.current_buffer.cursor_position = 0
 
-            @self.key_bindings.add('pagedown', filter=on_edit, eager=True)
+            @key_bindings.add('pagedown', filter=on_edit, eager=True)
             def _(event):
                 buffer = self.current_buffer
                 buffer.cursor_position = len(buffer.text)
 
-            @self.key_bindings.add('c-w', filter=on_edit, eager=True)
+            @key_bindings.add('enter', filter=on_edit, eager=True)
+            def _(event):
+                buffer = self.current_buffer
+                line = buffer.document.current_line_before_cursor
+                buffer.insert_text('\n' + line[:len(line) - len(line.lstrip())])
+
+            @key_bindings.add('c-w', filter=on_edit, eager=True)
             def _(event):
                 self.wrapped = not self.wrapped
 
-            @self.key_bindings.add('c-z', filter=on_edit, eager=True)
+            @key_bindings.add('c-z', filter=on_edit, eager=True)
             def _(event):
                 self.current_buffer.undo()
 
-            @self.key_bindings.add('c-s', filter=on_edit, eager=True)
+            @key_bindings.add('c-y', filter=on_edit, eager=True)
+            def _(event):
+                self.current_buffer.redo()
+
+            @key_bindings.add('c-s', filter=on_edit, eager=True)
             def _(event):
                 self.save(self.text.text)
 
-            @self.key_bindings.add('c-x', filter=on_edit, eager=True)
-            @self.key_bindings.add('escape', filter=on_edit, eager=True)
+            @key_bindings.add('c-x', filter=on_edit, eager=True)
+            @key_bindings.add('escape', filter=on_edit, eager=True)
             def _(event):
                 if self.modified:
                     self.show_exit_window = True
@@ -93,32 +97,22 @@ try:
                 else:
                     self.exit()
 
-            @self.key_bindings.add('y', filter=on_exit)
+            @key_bindings.add('y', filter=on_exit)
             def _(event):
                 self.save(self.text.text)
                 self.show_exit_window = False
                 self.exit()
 
-            @self.key_bindings.add('n', filter=on_exit)
+            @key_bindings.add('n', filter=on_exit)
             def _(event):
                 self.show_exit_window = False
                 self.exit()
 
-            @self.key_bindings.add('c', filter=on_exit)
+            @key_bindings.add('c', filter=on_exit)
             def _(event):
                 self.show_exit_window = False
                 self.layout.focus(self.text)
 
-            @self.key_bindings.add(Keys.Any, filter=on_edit)
-            def _(event):
-                buffer = self.current_buffer
-                text = event.data
-                if self.overwrite and buffer.cursor_position < len(buffer.text):
-                    buffer.delete(1)
-                    buffer.insert_text(text)
-                else:
-                    buffer.insert_text(text)
-
             self.root = FloatContainer(
                 content=HSplit(
                     [
@@ -135,14 +129,13 @@ try:
                 ]
             )
 
-            self.text.text = self.file.text
             self.text.buffer.on_text_changed += self.on_change
 
             Application.__init__(
                 self,
                 layout=Layout(self.root),
                 style=style_from_pygments_cls(PygmentsPyScriptStyle),
-                key_bindings=self.key_bindings,
+                key_bindings=key_bindings,
                 full_screen=True,
                 mouse_support=True,
                 paste_mode=True
@@ -150,6 +143,7 @@ try:
 
         def run(self) -> None:
             PysEditor.run(self)
+            self.text.text = self.file.text
             Application.run(self)
 
         def on_change(self, buffer):
@@ -165,7 +159,7 @@ try:
 
     TERMINAL_SUPPORT = True
 
-except ImportError as e:
+except BaseException as e:
     _error = e
 
     class PysTerminalEditor(PysEditor):

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/exceptions.py

@@ -14,22 +14,22 @@ if TYPE_CHECKING:
 @immutable
 class PysTraceback(Pys):
 
-    __slots__ = ('exception', 'context', 'position', 'cause', 'directly')
+    __slots__ = ('exception', 'context', 'position', 'primary', 'implicit')
 
     def __init__(
         self,
         exception: BaseException | type[BaseException],
         context: 'PysContext',
         position: 'PysPosition',
-        cause: Optional['PysTraceback'] = None,
-        directly: bool = False
+        primary: Optional['PysTraceback'] = None,
+        implicit: bool = False
     ) -> None:
 
         setimuattr(self, 'exception', exception)
         setimuattr(self, 'context', context)
         setimuattr(self, 'position', position)
-        setimuattr(self, 'cause', cause)
-        setimuattr(self, 'directly', directly)
+        setimuattr(self, 'primary', primary)
+        setimuattr(self, 'implicit', implicit)
 
     def __repr__(self) -> str:
         return f'<traceback of exception {self.exception!r}>'
@@ -97,14 +97,13 @@ class PysTraceback(Pys):
                 result += f': {magenta}{message}{reset}'
 
         return (
-            self.cause.string_traceback() +
             (
-                '\n\nThe above exception was the direct cause of the following exception:\n\n'
-                if self.directly else
-                '\n\nDuring handling of the above exception, another exception occurred:\n\n'
-            ) + result
-            if self.cause else
-            result
+                f'{self.primary.string_traceback()}\n\n' + (
+                    "The above exception was the direct cause of the following exception"
+                    if self.implicit else
+                    "During handling of the above exception, another exception occurred"
+                ) + f':\n\n{result}'
+            ) if self.primary else result
         )
 
 class PysSignal(Pys, BaseException):

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/handlers.py

@@ -1,13 +1,13 @@
 from .cache import pys_sys
 from .constants import ENV_PYSCRIPT_NO_GIL
 from .objects import PysFunction
+from .utils.generic import is_environ
 
-from os import environ
 from types import MethodType
 
 wrapper_function = (MethodType, classmethod, staticmethod)
 
-if environ.get(ENV_PYSCRIPT_NO_GIL) is None:
+if not is_environ(ENV_PYSCRIPT_NO_GIL):
     from threading import RLock
 
     lock = RLock()

{pyscript_programming_language-1.12.0 → pyscript_programming_language-1.12.1}/pyscript/core/highlight.py

@@ -351,17 +351,17 @@ try:
         tokens = PygmentsPyScriptLexer.tokens.copy()
         tokens['root'] = [
             # Shell prompts
-            (r'^/(clear|clean|exit)$', Generic.Prompt)
+            (r'\A/(clear|clean|exit)\z', Generic.Prompt)
         ] + tokens['root']
 
-    PYGMENTS = True
-
     del (
         _set_constant_keywords, _unicode_name, _newlines, _integer, _scientific, _imaginary, _dollar,
         _raw_string_prefixes, _string_or_bytes_prefixes, 
     )
 
-except ImportError as e:
+    PYGMENTS = True
+
+except BaseException as e:
     _error = e
 
     class PygmentsPyScriptStyle(Pys):