pyscript-programming-language 1.10.1__tar.gz → 1.10.3__tar.gz

{pyscript_programming_language-1.10.1/pyscript_programming_language.egg-info → pyscript_programming_language-1.10.3}/PKG-INFO

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

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.3}/pyscript/__main__.py

@@ -1,12 +1,12 @@
 from .core.buffer import PysFileBuffer
-from .core.cache import path, undefined, hook
+from .core.cache import undefined, hook
 from .core.constants import DEFAULT, DEBUG, DONT_SHOW_BANNER_ON_SHELL, NO_COLOR
 from .core.highlight import (
     HLFMT_HTML, HLFMT_ANSI, HLFMT_BBCODE, pys_highlight, PygmentsPyScriptStyle, PygmentsPyScriptLexer
 )
 from .core.runner import _normalize_globals, pys_runner, pys_shell
-from .core.utils.module import get_module_name_from_path
-from .core.utils.path import normpath
+from .core.utils.module import get_module_name_from_path, remove_python_path
+from .core.utils.path import normpath, getcwd
 from .core.version import __version__
 
 try:
@@ -79,7 +79,7 @@ parser.add_argument(
 parser.add_argument(
     '-d', '--debug',
     action='store_true',
-    help="Set a debug flag, this will remove the assert statement"
+    help="Set a debug flag, this will ignore assert statement"
 )
 
 parser.add_argument(
@@ -108,6 +108,12 @@ parser.add_argument(
     help="Set a Python recursion limit"
 )
 
+parser.add_argument(
+    '-P',
+    action='store_true',
+    help="Don't prepend a potentially unsafe path to sys.path (python sys)"
+)
+
 parser.add_argument(
     '-q',
     action='store_true',
@@ -121,7 +127,7 @@ def argument_error(argument, message):
 args = parser.parse_args(split_argv())
 
 if args.highlight and args.file is None:
-    argument_error("-l/--highlight", "argument 'file' required")
+    argument_error("-l/--highlight", "argument 'file' is required")
 
 if args.py_recursion is not None:
     try:
@@ -136,6 +142,9 @@ if args.debug:
     flags |= DEBUG
 if args.no_color or environ.get('NO_COLOR') is not None:
     flags |= NO_COLOR
+if args.P:
+    for cwd in {'', '.', getcwd()}:
+        remove_python_path(cwd)
 if args.q:
     flags |= DONT_SHOW_BANNER_ON_SHELL
 
@@ -148,15 +157,15 @@ if args.file is not None:
     except FileNotFoundError:
         parser.error(f"can't open file {path!r}: No such file or directory")
     except PermissionError:
-        parser.error(f"can't open file {path!r}: Permission denied.")
+        parser.error(f"can't open file {path!r}: Permission denied")
     except IsADirectoryError:
-        parser.error(f"can't open file {path!r}: Path is not a file.")
+        parser.error(f"can't open file {path!r}: Path is not a file")
     except NotADirectoryError:
-        parser.error(f"can't open file {path!r}: Attempting to access directory from file.")
+        parser.error(f"can't open file {path!r}: 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.")
+        parser.error(f"can't open file {path!r}: Attempting to access a system directory or file")
     except UnicodeDecodeError:
-        parser.error(f"can't read file {path!r}: Bad file.")
+        parser.error(f"can't read file {path!r}: Bad file")
     except BaseException as e:
         parser.error(f"file {path!r}: Unexpected error: {e}")
 
@@ -189,14 +198,17 @@ if args.file is not None:
             flags=flags
         )
 
-        if args.inspect:
-            code = pys_shell(
-                globals=result.context.symbol_table,
-                flags=result.context.flags,
-                parser_flags=result.parser_flags
-            )
-        else:
-            code = result.end_process()[0]
+        code, _ = result.end_process()
+
+        if args.inspect and not (sys.stdout.closed or sys.stderr.closed):
+            if sys.stdin.closed:
+                print("Can't run interactive shell: sys.stdin closed", file=sys.stderr)
+            else:
+                code = pys_shell(
+                    globals=result.context.symbol_table,
+                    flags=result.context.flags,
+                    parser_flags=result.parser_flags
+                )
 
 elif args.command is not None:
     file = PysFileBuffer(args.command)

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.3}/pyscript/core/analyzer.py

@@ -103,7 +103,7 @@ class PysAnalyzer(Pys):
 
         for element in node.arguments:
 
-            if isinstance(element, tuple):
+            if element.__class__ is tuple:
                 token, value = element
                 name = token.value
                 if name in keyword_names:
@@ -374,7 +374,8 @@ class PysAnalyzer(Pys):
         parameter_names = set()
 
         for element in node.parameters:
-            token = (element[0] if isinstance(element, tuple) else element)
+            is_keyword = element.__class__ is tuple
+            token = element[0] if is_keyword else element
             name = token.value
 
             if name in parameter_names:
@@ -382,7 +383,7 @@ class PysAnalyzer(Pys):
 
             parameter_names.add(name)
 
-            if isinstance(element, tuple):
+            if is_keyword:
                 self.visit(element[1])
                 if self.error:
                     return

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.3}/pyscript/core/exceptions.py

@@ -43,9 +43,9 @@ class PysTraceback(Pys):
         position = self.position
 
         if colored := not (context.flags & NO_COLOR):
-            reset = ACOLORS['reset']
-            magenta = ACOLORS['magenta']
-            bmagenta = ACOLORS['bold-magenta']
+            reset = ACOLORS('reset')
+            magenta = ACOLORS('magenta')
+            bmagenta = ACOLORS('bold-magenta')
         else:
             reset = ''
             magenta = ''

{pyscript_programming_language-1.10.1 → pyscript_programming_language-1.10.3}/pyscript/core/highlight.py

@@ -57,7 +57,7 @@ try:
     ])
 
     _keywords = '|'.join(_set_keywords)
-    _unicode_name = f'[{xid_start}][{xid_continue}]'
+    _unicode_name = f'[{xid_start}][{xid_continue}]*'
     _dollar_prefix = r'(?:\$(?:[^\S\r\n]*))?'
     _raw_string_prefixes = r'((?:R|r|BR|RB|Br|rB|Rb|bR|br|rb))'
     _string_prefixes = r'((?:B|b)?)'
@@ -184,14 +184,14 @@ try:
 
                 # Class definition
                 (
-                    rf'\b({KEYWORDS["class"]})\b(\s*)(?!{_keywords})({_dollar_prefix}\b{_unicode_name}*)\b',
+                    rf'\b({KEYWORDS["class"]})\b(\s+)\b(?!{_keywords})({_dollar_prefix}{_unicode_name})\b',
                     bygroups(Keyword.Constant, Whitespace, Name.Class)
                 ),
 
                 # Function definition
                 (
-                    rf'\b({KEYWORDS["def"]}|{KEYWORDS["define"]}|{KEYWORDS["func"]}|{KEYWORDS["function"]})\b(\s*)'
-                    rf'(?!{_keywords})({_dollar_prefix}\b{_unicode_name}*)\b',
+                    rf'\b({KEYWORDS["def"]}|{KEYWORDS["define"]}|{KEYWORDS["func"]}|{KEYWORDS["function"]})\b(\s+)\b'
+                    rf'(?!{_keywords})({_dollar_prefix}{_unicode_name})\b',
                     bygroups(Keyword.Constant, Whitespace, Name.Function)
                 ),
 
@@ -200,21 +200,27 @@ try:
 
                 # Built-in types and exceptions
                 (
-                    rf'{_dollar_prefix}(?:{"|".join(_builtin_types)})\b',
+                    rf'{_dollar_prefix}\b(?:{"|".join(_builtin_types)})\b',
                     Name.Class.Builtin
                 ),
 
                 # Built-in functions
                 (
-                    rf'{_dollar_prefix}{_unicode_name}*(?=\s*\()|\b(?:{"|".join(_builtin_functions)})\b',
+                    rf'{_dollar_prefix}\b(?:{"|".join(_builtin_functions)})\b',
                     Name.Function.Builtin
                 ),
 
+                # Function calls
+                (
+                    rf'{_dollar_prefix}\b{_unicode_name}\b(?=\s*\()',
+                    Name.Function
+                ),
+
                 # Constants
                 (rf'{_dollar_prefix}\b(?:[A-Z_]*[A-Z][A-Z0-9_]*)\b', Name.Constant),
 
                 # Variables
-                (rf'{_dollar_prefix}\b{_unicode_name}*\b', Name.Variable),
+                (rf'{_dollar_prefix}\b{_unicode_name}\b', Name.Variable),
 
                 # Whitespaces
                 (r'\s+', Whitespace),
@@ -229,7 +235,7 @@ try:
 
                 # Invalid tokens
                 (r'\\.', Error),
-                (rf'{_dollar_prefix[:-1]}.', Error)
+                (r'\$(?:[^\S\r\n]*)(.?)', Error)
             ],
 
             'code-tags': [
@@ -457,7 +463,10 @@ def pys_highlight(
                 previous_token = tokens[j]
                 if previous_token.match(TOKENS['KEYWORD'], KEYWORDS['class']):
                     type_fmt = 'identifier-type'
-                elif previous_token.match(TOKENS['KEYWORD'], KEYWORDS['func'], KEYWORDS['function']):
+                elif previous_token.match(
+                    TOKENS['KEYWORD'],
+                    KEYWORDS['def'], KEYWORDS['define'], KEYWORDS['func'], KEYWORDS['function']
+                ):
                     type_fmt = 'identifier-function'
                 else:
                     j = i + 1