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

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

@@ -1,15 +1,18 @@
 Metadata-Version: 2.4
 Name: pyscript-programming-language
-Version: 1.12.11
+Version: 1.12.13
 Summary: PyScript Programming Language
 Home-page: https://azzammuhyala.github.io/pyscript
 Author: azzammuhyala
 Author-email: azzammuhyala <azzammuhyala@gmail.com>
 License-Expression: MIT
 Project-URL: Homepage, https://azzammuhyala.github.io/pyscript
+Project-URL: Documentation, https://azzammuhyala.github.io/pyscript
 Project-URL: Source, https://github.com/azzammuhyala/pyscript
-Project-URL: Bug Tracker, https://github.com/azzammuhyala/pyscript/issues
+Project-URL: Releases, https://github.com/azzammuhyala/pyscript/releases
 Project-URL: Change Log, https://github.com/azzammuhyala/pyscript/blob/main/changelog.md
+Project-URL: Bug Tracker, https://github.com/azzammuhyala/pyscript/issues
+Project-URL: PyPi Stats, https://pepy.tech/projects/pyscript-programming-language
 Keywords: pyscript,pyslang,pys,programming,language,programming language
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -27,10 +30,20 @@ Dynamic: author
 Dynamic: home-page
 Dynamic: requires-python
 
-# PyScript 🐍🟨🟦⬛
+# PyScript
 
 <div align="center">
     <img src="https://github.com/azzammuhyala/pyscript/blob/main/PyScript.png?raw=true" alt="PyScript Logo" width="200">
+    <br>
+    <a href="https://pepy.tech/project/pyscript-programming-language">
+        <img src="https://static.pepy.tech/personalized-badge/pyscript-programming-language?period=total&units=NONE&left_color=GRAY&right_color=GREEN&left_text=downloads" alt="PyPI Downloads">
+    </a>
+    <a href="https://en.wikipedia.org/wiki/MIT_License">
+        <img src="https://img.shields.io/badge/license-MIT-orange" alt="License MIT">
+    </a>
+    <a href="https://www.python.org/">
+        <img src="https://img.shields.io/badge/python-3.10-yellow" alt="Python 3.10+">
+    </a>
 </div>
 
 PyScript is a programming language built on top of Python. It combines some syntax from Python and JavaScript, so if

{pyscript_programming_language-1.12.11 → pyscript_programming_language-1.12.13}/README.md

@@ -1,7 +1,17 @@
-# PyScript 🐍🟨🟦⬛
+# PyScript
 
 <div align="center">
     <img src="https://github.com/azzammuhyala/pyscript/blob/main/PyScript.png?raw=true" alt="PyScript Logo" width="200">
+    <br>
+    <a href="https://pepy.tech/project/pyscript-programming-language">
+        <img src="https://static.pepy.tech/personalized-badge/pyscript-programming-language?period=total&units=NONE&left_color=GRAY&right_color=GREEN&left_text=downloads" alt="PyPI Downloads">
+    </a>
+    <a href="https://en.wikipedia.org/wiki/MIT_License">
+        <img src="https://img.shields.io/badge/license-MIT-orange" alt="License MIT">
+    </a>
+    <a href="https://www.python.org/">
+        <img src="https://img.shields.io/badge/python-3.10-yellow" alt="Python 3.10+">
+    </a>
 </div>
 
 PyScript is a programming language built on top of Python. It combines some syntax from Python and JavaScript, so if

pyscript_programming_language-1.12.13/changelog.md

@@ -0,0 +1,11 @@
+# Change Log
+
+## [1.12.13] - 03/05/2026
+
+### Added
+- `PysPythonFunction` is immutable.
+- _etc._
+
+### Fixed
+- Fixed some bugs.
+- _etc._

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyscript-programming-language"
-version = "1.12.11"
+version = "1.12.13"
 description = "PyScript Programming Language"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"
@@ -34,9 +34,12 @@ classifiers = [
 
 [project.urls]
 Homepage = "https://azzammuhyala.github.io/pyscript"
+Documentation = "https://azzammuhyala.github.io/pyscript"
 Source = "https://github.com/azzammuhyala/pyscript"
-"Bug Tracker" = "https://github.com/azzammuhyala/pyscript/issues"
+Releases = "https://github.com/azzammuhyala/pyscript/releases"
 "Change Log" = "https://github.com/azzammuhyala/pyscript/blob/main/changelog.md"
+"Bug Tracker" = "https://github.com/azzammuhyala/pyscript/issues"
+"PyPi Stats" = "https://pepy.tech/projects/pyscript-programming-language"
 
 [project.optional-dependencies]
 other = [

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

@@ -9,11 +9,11 @@ from .core.editor.terminal import PysTerminalEditor, TERMINAL_SUPPORT
 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.runner import _namespace_to_symbol_table, pys_runner, pys_shell
 from .core.utils.debug import USE_NOTEBOOK
 from .core.utils.generic import is_environ
 from .core.utils.module import find_module_path, remove_python_path
-from .core.utils.path import getcwd, base, normpath
+from .core.utils.path import getcwd, base
 from .core.version import __version__
 
 if PYGMENTS:
@@ -42,14 +42,15 @@ FORMATER_HIGHLIGHT_MAP = {
     'bbcode': HLFMT_BBCODE
 }
 
-EDITOR_MAP = {}
+EDITOR_MAP = {
+    name: cls
+    for support, name, cls in [
+        (GUI_SUPPORT,      'gui',      PysGUIEditor),
+        (TERMINAL_SUPPORT, 'terminal', PysTerminalEditor)
+    ] if support
+}
 
-for supported, name, class_editor in [
-    (GUI_SUPPORT,      'gui',      PysGUIEditor),
-    (TERMINAL_SUPPORT, 'terminal', PysTerminalEditor)
-]:
-    if supported:
-        EDITOR_MAP[name] = class_editor
+arguments_requiring_value = {'-l', '--highlight', '-r', '--py-recursion'}
 
 parser = ArgumentParser(
     prog=f'{base(sys.executable)} -m pyscript',
@@ -83,6 +84,7 @@ if EDITOR_MAP:
         default=None,
         help="open the editor panel from a 'file'",
     )
+    arguments_requiring_value.update({'-e', '--editor'})
 
 parser.add_argument(
     '-i', '--inspect',
@@ -174,21 +176,28 @@ def argument_error(argument, message):
     parser.exit(2, f"{parser.prog}: error: argument {argument}: {message}\n")
 
 argv = sys.argv[1:]
+argc = len(argv)
+index = 0
+arg_index = -1
 
-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]
+while index < argc:
+    arg = argv[index]
+    if not arg.startswith('-') or arg == '--':
+        break
 
-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)
+    if arg in ('-c', '--command'):
+        arg_index = index + 2
+        break
+    elif arg in ('-m', '--module'):
+        arg_index = index + 2
+        break
 
-ofs_idx = max(com_idx, mod_idx)
+    index += 1
+    if arg in arguments_requiring_value:
+        index += 1
 
-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:]
+args = parser.parse_args(argv if arg_index == -1 else argv[:arg_index])
+arg  = args.arg               if arg_index == -1 else argv[arg_index:]
 
 if args.terminal:
 
@@ -242,32 +251,30 @@ if args.P:
 
 pys_sys.argv = argv = ['', *arg]
 
-# clean up
-try:
-    if PYGMENTS:
-        del (
-            BBCodeFormatter, HtmlFormatter, LatexFormatter, TerminalFormatter, TerminalTrueColorFormatter,
-            Terminal256Formatter
-        )
-
-    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, mod_idx, ofs_idx, arg, pys_sys,
-        __version__, is_environ, remove_python_path, getcwd, base, PysGUIEditor, PysTerminalEditor, ArgumentParser
-    )
-
-    del (
-        supported, name, class_editor, condition, flag, fd, kernel32, i
-    )
-except:
-    pass
+def clean_up() -> None:
+    g = globals()
+
+    for name in {
+        'ArgumentParser', 'BBCodeFormatter', 'CLASSIC_LINE_SHELL', 'DEBUG', 'DEFAULT', 'DONT_SHOW_BANNER_ON_SHELL',
+        'EDITOR_MAP', 'ENV_PYSCRIPT_CLASSIC_LINE_SHELL', 'ENV_PYSCRIPT_NO_COLOR_PROMPT', 'FORMATER_HIGHLIGHT_MAP',
+        'FORMATER_PYGMENTS_MAP', 'GUI_SUPPORT', 'HLFMT_ANSI', 'HLFMT_BBCODE', 'HLFMT_HTML', 'HtmlFormatter',
+        'LatexFormatter', 'NOTEBOOK', 'NO_COLOR', 'NO_COLOR_PROMPT', 'OPTIONAL', 'PYGMENTS', 'PygmentsPyScriptLexer',
+        'PygmentsPyScriptStyle', 'PysFileBuffer', 'PysGUIEditor', 'PysTerminalEditor', 'REMAINDER', 'TERMINAL_SUPPORT',
+        'Terminal256Formatter', 'TerminalFormatter', 'TerminalTrueColorFormatter', 'USE_NOTEBOOK', '__version__',
+        '_namespace_to_symbol_table', 'arg', 'arg_index', 'argc', 'args', 'argument_error', 'arguments_requiring_value',
+        'argv', 'base', 'clean_up', 'condition', 'ctypes', 'execute', 'fd', 'file', 'find_module_path', 'flag',
+        'getcwd', 'highlight', 'i', 'index', 'is_environ', 'kernel32', 'load_file', 'module_path', 'parser',
+        'pys_highlight', 'pys_sys', 'remove_python_path'
+    }:
+        try:
+            del g[name]
+        except:
+            continue
 
-def load_file(path):
-    file = PysFileBuffer('', path)
+def load_file(path) -> PysFileBuffer:
     try:
         with open(path, 'r', encoding='utf-8') as file:
-            file = PysFileBuffer(file, path)
+            return PysFileBuffer(file, path)
     except FileNotFoundError:
         if not (EDITOR_MAP and args.editor):
             argument_error('file', f"can't open file \"{path}\": No such file or directory")
@@ -283,36 +290,42 @@ def load_file(path):
         argument_error('file', f"can't read file \"{path}\": Bad file")
     except BaseException as e:
         argument_error('file', f"file \"{path}\": Unexpected error: {e}")
-    return file
+    return PysFileBuffer('', path)
+
+def execute(file: PysFileBuffer) -> None:
+    global code
+
+    not_show_banner_flag = DONT_SHOW_BANNER_ON_SHELL
+    inspect = args.inspect
+    symtab = _namespace_to_symbol_table(undefined, file)
+
+    clean_up()
 
-def execute(file):
     result = pys_runner(
         file=file,
         mode='exec',
-        symbol_table=_normalize_namespace(undefined, file),
+        symbol_table=symtab,
         flags=flags
     )
 
     code, _ = result.end_process()
 
-    if args.inspect:
+    if inspect:
         if sys.stdout.closed or sys.stderr.closed:
-            return 1
+            code = 1
         elif sys.stdin.closed:
             print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
-            return 1
+            code = 1
         else:
-            return pys_shell(
+            code = pys_shell(
                 globals=result.context.symbol_table,
-                flags=result.context.flags | DONT_SHOW_BANNER_ON_SHELL,
+                flags=result.context.flags | not_show_banner_flag,
                 parser_flags=result.parser_flags
             )
 
-    return code
-
 if args.file is not None:
     argv[0] = args.file
-    file = load_file(normpath(args.file))
+    file = load_file(args.file)
 
     if EDITOR_MAP and args.editor:
         try:
@@ -334,14 +347,17 @@ if args.file is not None:
                     highlight(
                         code=file.text,
                         lexer=PygmentsPyScriptLexer(),
-                        formatter=FORMATER_PYGMENTS_MAP[args.highlight](style=PygmentsPyScriptStyle, full=True)
+                        formatter=FORMATER_PYGMENTS_MAP[args.highlight](
+                            style=PygmentsPyScriptStyle,
+                            full=True
+                        )
                     )
                 )
         except BaseException as e:
             argument_error('-l/--highlight', e)
 
     else:
-        code = execute(file)
+        execute(file)
 
 elif args.module is not None:
     _, module_path = find_module_path(None, args.module, '__main__')
@@ -350,13 +366,14 @@ elif args.module is not None:
 
     file = load_file(module_path)
     argv[0] = file.name
-    code = execute(file)
+    execute(file)
 
 elif args.command is not None:
     argv[0] = '-c'
-    code = execute(PysFileBuffer(args.command, '<arg-command>'))
+    execute(PysFileBuffer(args.command, '<arg-command>'))
 
 else:
+    clean_up()
     code = pys_shell(
         globals=undefined,
         flags=flags

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

@@ -2,6 +2,7 @@ from .bases import Pys
 from .constants import PYSCRIPT_PATH, CORE_PATH, LIBRARIES_PATH, SITE_PACKAGES_PATH, DEFAULT
 from .utils.debug import print_display, print_traceback, clear_shell
 from .utils.decorators import inheritable, singleton
+from .utils.path import base
 
 from types import ModuleType
 from typing import Literal
@@ -17,7 +18,7 @@ pys_sys = ModuleType(
 
 pys_sys.__running_shell__ = False
 pys_sys.__running_breakpoint__ = False
-pys_sys.path = [SITE_PACKAGES_PATH, LIBRARIES_PATH]
+pys_sys.path = [LIBRARIES_PATH, SITE_PACKAGES_PATH]
 pys_sys.loading_modules = set()
 pys_sys.modules = {}
 pys_sys.singletons = {}
@@ -30,9 +31,10 @@ 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.executable = f'{base(sys.executable)} -m pyscript'
 pys_sys.ps1 = '>>> '
 pys_sys.ps2 = '... '
+pys_sys._is_gil_enabled = lambda : pys_sys.gil
 
 for name in (
     'exit', 'float_info', 'float_repr_style', 'get_int_max_str_digits', 'getdefaultencoding',

{pyscript_programming_language-1.12.11 → pyscript_programming_language-1.12.13}/pyscript/core/checks.py

@@ -37,7 +37,8 @@ is_blacklist_python_builtin = frozenset([
 ]).__contains__
 
 is_python_extension = frozenset([
-    '.py', '.ipy', '.pyc', '.pyd', '.pyi', '.pyo', '.pyp', '.pyw', '.pyz', '.rpy', '.xpy', '.pyproj'
+    '.cgi', '.fcgi', '.gyp', '.gypi', '.ipy', '.lmi', '.pxd', '.pxi', '.py', '.py3', '.pyc', '.pyd', '.pyde', '.pyi',
+    '.pyo', '.pyp', '.pyproj', '.pyt', '.pyw', '.pyx', '.pyz', '.rpy', '.spec', '.tac', '.wsgi', '.xpy'
 ]).__contains__
 
 is_left_bracket = frozenset(BRACKETS_MAP.keys()).__contains__

{pyscript_programming_language-1.12.11 → pyscript_programming_language-1.12.13}/pyscript/core/constants.py

@@ -6,6 +6,8 @@ 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')
 ICON_PATH = os.path.join(OTHER_PATH, 'PyScript.ico')
+GLOBAL_HISTORY_PATH = os.path.join(os.path.expanduser('~'), '.pyscript_history')
+GUI_GEOMETRY_PATH = os.path.join(OTHER_PATH, 'gui_geometry.txt')
 
 ENV_PYSCRIPT_NO_EXCEPTHOOK = 'PYSCRIPT_NO_EXCEPTHOOK'
 ENV_PYSCRIPT_NO_GIL = 'PYSCRIPT_NO_GIL'

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

@@ -1,9 +1,11 @@
 from .bases import PysEditor
 from ..buffer import PysFileBuffer
-from ..constants import ICON_PATH
+from ..constants import GUI_GEOMETRY_PATH, ICON_PATH
 from ..highlight import PygmentsPyScriptStyle, PygmentsPyScriptLexer
 from ..version import __version__
 
+import re
+
 try:
     from tkinter import Tk, Scrollbar, Text, messagebox
     from tkinter.font import Font
@@ -15,7 +17,8 @@ try:
             Tk.__init__(self)
 
             def on_save(event=None):
-                self.save(self.text.get('1.0', 'end'))
+                text = self.text.get('1.0', 'end')
+                self.save(text[:-1] if text.endswith(('\r\n', '\r', '\n')) else text)
                 update()
                 return 'break'
 
@@ -30,6 +33,10 @@ try:
                 else:
                     self.destroy()
 
+            def on_configure(event):
+                if event.widget == self:
+                    save_geometry(event.x, event.y, event.width, event.height, self.wm_state() == 'zoomed')
+
             def on_modified(event=None):
                 text = self.text
                 if text.edit_modified():
@@ -69,10 +76,15 @@ try:
                 text.insert('insert', '\n' + line[:len(line) - len(line.lstrip())])
                 return 'break'
 
-            try:
-                self.wm_iconbitmap(ICON_PATH)
-            except:
-                pass
+            def save_geometry(left, top, width, height, zoom):
+                try:
+                    with open(GUI_GEOMETRY_PATH, 'w') as f:
+                        zoom = bool(zoom)
+                        if not zoom:
+                            self.last_geometry = f'{width}x{height}+{left}+{top}'
+                        f.write(f'{self.last_geometry},{int(zoom)}')
+                except:
+                    pass
 
             self.lexer = PygmentsPyScriptLexer()
             self.font = Font(family='Consolas', size=10)
@@ -102,6 +114,7 @@ try:
             self.text.bind('<Prior>', on_page_up)
             self.text.bind('<Next>', on_page_down)
 
+            self.bind('<Configure>', on_configure)
             self.bind_all('<Control-S>', on_save)
             self.bind_all('<Control-s>', on_save)
             self.bind_all('<Control-W>', on_toggle_wrap)
@@ -111,7 +124,29 @@ 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')
+            try:
+                with open(GUI_GEOMETRY_PATH, 'r') as f:
+                    width, height, left, top, zoom = map(
+                        int,
+                        re.match(r'(\d{1,7})x(\d{1,7})\+(-?\d{1,7})\+(-?\d{1,7}),(0|1)', f.read(64)).groups()
+                    )
+                    self.last_geometry = f'{width}x{height}+{left}+{top}'
+            except:
+                left = self.winfo_screenwidth() // 2 - 250
+                top = self.winfo_screenheight() // 2 - 250
+                zoom = False
+                self.last_geometry = f'500x500+{left}+{top}'
+                save_geometry(left, top, 500, 500, zoom)
+
+            try:
+                self.wm_iconbitmap(ICON_PATH)
+            except:
+                pass
+
+            if zoom:
+                self.wm_state('zoomed')
+
+            self.wm_geometry(self.last_geometry)
             self.wm_minsize(300, 250)
             self.wm_protocol('WM_DELETE_WINDOW', on_close)
 

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

@@ -27,16 +27,16 @@ class PysTraceback(Pys):
         # 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)
         setimuattr(self, 'position', position)
         setimuattr(self, 'primary', primary)
         setimuattr(self, 'implicit', implicit)
 
+        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
+
     def __repr__(self) -> str:
         return f'<traceback of {self.exception!r}>'
 

{pyscript_programming_language-1.12.11 → pyscript_programming_language-1.12.13}/pyscript/core/handlers.py

@@ -10,9 +10,34 @@ from typing import Any
 
 wrapper_function = (MethodType, classmethod, staticmethod)
 
-if not is_environ(ENV_PYSCRIPT_NO_GIL):
-    from threading import RLock
+if is_environ(ENV_PYSCRIPT_NO_GIL):
+
+    def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
+        ins = isinstance
 
+        if ins(object, PysFunction):
+            code = object.__code__
+            code.context = context
+            code.position = position
+
+        elif ins(object, wrapper_function):
+            handle_call(object.__func__, context, position)
+
+        elif ins(object, type):
+            gt = getattr
+
+            method = gt(object, '__new__', None)
+            if method is not None:
+                handle_call(method, context, position)
+
+            method = gt(object, '__init__', None)
+            if method is not None:
+                handle_call(method, context, position)
+
+    GIL = pys_sys.gil = False
+
+else:
+    from threading import RLock
     gil_lock = RLock()
 
     def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
@@ -38,29 +63,4 @@ if not is_environ(ENV_PYSCRIPT_NO_GIL):
                 if method is not None:
                     handle_call(method, context, position)
 
-    GIL = pys_sys.gil = True
-else:
-
-    def handle_call(object: Any, context: PysContext, position: PysPosition) -> None:
-        ins = isinstance
-
-        if ins(object, PysFunction):
-            code = object.__code__
-            code.context = context
-            code.position = position
-
-        elif ins(object, wrapper_function):
-            handle_call(object.__func__, context, position)
-
-        elif ins(object, type):
-            gt = getattr
-
-            method = gt(object, '__new__', None)
-            if method is not None:
-                handle_call(method, context, position)
-
-            method = gt(object, '__init__', None)
-            if method is not None:
-                handle_call(method, context, position)
-
-    GIL = pys_sys.gil = False
+    GIL = pys_sys.gil = True

{pyscript_programming_language-1.12.11 → pyscript_programming_language-1.12.13}/pyscript/core/highlight.py

@@ -272,7 +272,7 @@ try:
 
             'string-escapes': [
                 (rf'\\([nrtbfav\'"\\]|{_newlines})', String.Escape),
-                (r'\\[0-7]{1,3}}', String.Escape.Oct),
+                (r'\\[0-7]{1,3}', String.Escape.Oct),
                 (r'\\x[0-9A-Fa-f]{2}', String.Escape.Hex),
                 (r'\\u[0-9A-Fa-f]{4}', String.Escape.Uni),
                 (r'\\U[0-9A-Fa-f]{8}', String.Escape.Uni),
@@ -485,47 +485,58 @@ def pys_highlight(
     last_index = 0
     brackets_stack = []
 
+    T_NULL = TOKENS['NULL']
+    T_KEYWORD = TOKENS['KEYWORD']
+    T_IDENTIFIER = TOKENS['IDENTIFIER']
+    T_NUMBER = TOKENS['NUMBER']
+    T_STRING = TOKENS['STRING']
+    T_NEWLINE = TOKENS['NEWLINE']
+    T_COMMENT = TOKENS['COMMENT']
+    T_LEFT_PARENTHESIS = TOKENS['LEFT_PARENTHESIS']
+    T_NONE = TOKENS['NONE']
+    T_WHITESPACES = frozenset([T_NEWLINE, T_COMMENT])
+
     for i, token in enumerate(tokens):
         ttype = token.type
         tvalue = token.value
 
-        if ttype == TOKENS['NULL']:
+        if ttype == T_NULL:
             type_format = 'end'
 
-        elif ttype == TOKENS['KEYWORD']:
+        elif ttype == T_KEYWORD:
             type_format = 'keyword-constant' if is_constant_keyword(tvalue) else 'keyword'
 
-        elif ttype == TOKENS['IDENTIFIER']:
+        elif ttype == T_IDENTIFIER:
             if tvalue in BUILTIN_TYPES:
                 type_format = 'identifier-type'
             elif tvalue in BUILTIN_FUNCTIONS:
                 type_format = 'identifier-function'
             else:
                 j = i - 1
-                while j > 0 and tokens[j].type in (TOKENS['NEWLINE'], TOKENS['COMMENT']):
+                while j > 0 and tokens[j].type in T_WHITESPACES:
                     j -= 1
-                previous_token = tokens[j]
-                if previous_token.match(TOKENS['KEYWORD'], 'class'):
+                last_is = tokens[j].match
+                if last_is(T_KEYWORD, 'class'):
                     type_format = 'identifier-type'
-                elif previous_token.match(TOKENS['KEYWORD'], 'func', 'function'):
+                elif last_is(T_KEYWORD, 'func', 'function'):
                     type_format = 'identifier-function'
                 else:
                     j = i + 1
-                    if (j < len(tokens) and tokens[j].type == TOKENS['LEFT_PARENTHESIS']):
+                    if (j < len(tokens) and tokens[j].type == T_LEFT_PARENTHESIS):
                         type_format = 'identifier-function'
                     else:
                         type_format = 'identifier-constant' if tvalue.isupper() else 'identifier'
 
-        elif ttype == TOKENS['NUMBER']:
+        elif ttype == T_NUMBER:
             type_format = 'number'
 
-        elif ttype == TOKENS['STRING']:
+        elif ttype == T_STRING:
             type_format = 'string'
 
-        elif ttype == TOKENS['NEWLINE']:
+        elif ttype == T_NEWLINE:
             type_format = 'newline'
 
-        elif ttype == TOKENS['COMMENT']:
+        elif ttype == T_COMMENT:
             type_format = 'comment'
 
         elif is_bracket(ttype):
@@ -537,7 +548,7 @@ def pys_highlight(
             else:
                 type_format = f'brackets-{len(brackets_stack) % max_bracket_level}'
 
-        elif ttype == TOKENS['NONE']:
+        elif ttype == T_NONE:
             type_format = 'invalid'
 
         else:
@@ -547,7 +558,7 @@ def pys_highlight(
             result += formatter('default', PysPosition(file, last_index, token.position.start), space)
         result += formatter(type_format, token.position, text[token.position.start:token.position.end])
 
-        if ttype == TOKENS['NULL']:
+        if ttype == T_NULL:
             break
 
         last_index = token.position.end