pyscript-programming-language 1.11.2__tar.gz → 1.11.3__tar.gz

{pyscript_programming_language-1.11.2/pyscript_programming_language.egg-info → pyscript_programming_language-1.11.3}/PKG-INFO

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

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/__main__.py

@@ -1,8 +1,8 @@
 from .core.buffer import PysFileBuffer
 from .core.cache import undefined, hook
 from .core.constants import DEFAULT, DEBUG, DONT_SHOW_BANNER_ON_SHELL, NO_COLOR
-from .core.editor.gui import PysGUIEditor
-from .core.editor.terminal import PysTerminalEditor
+from .core.editor.gui import PysGUIEditor, GUI_SUPPORT
+from .core.editor.terminal import PysTerminalEditor, TERMINAL_SUPPORT
 from .core.highlight import (
     HLFMT_HTML, HLFMT_ANSI, HLFMT_BBCODE, pys_highlight, PygmentsPyScriptStyle, PygmentsPyScriptLexer
 )
@@ -42,17 +42,18 @@ FORMAT_HIGHLIGHT_MAP = {
     'bbcode': HLFMT_BBCODE
 }
 
+EDITOR_MAP = {}
+
+if GUI_SUPPORT:
+    EDITOR_MAP['gui'] = PysGUIEditor
+if TERMINAL_SUPPORT:
+    EDITOR_MAP['terminal'] = PysTerminalEditor
+
 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(
-    '-v', '--version',
-    action='version',
-    version=f"PyScript {__version__}",
-)
-
 parser.add_argument(
     '-c', '--command',
     type=str,
@@ -66,17 +67,18 @@ parser.add_argument(
     help="Set a debug flag, this will ignore assert statement. Check the flag is active with the __debug__ keyword"
 )
 
-parser.add_argument(
-    '-e', '--editor',
-    choices=('gui', 'terminal'),
-    default=None,
-    help="Open the editor panel from a 'file'",
-)
+if EDITOR_MAP:
+    parser.add_argument(
+        '-e', '--editor',
+        choices=tuple(EDITOR_MAP.keys()),
+        default=None,
+        help="Open the editor panel from a 'file'",
+    )
 
 parser.add_argument(
     '-i', '--inspect',
     action='store_true',
-    help="Inspect interactively after running a 'file'",
+    help="Inspect interactively after running a code",
 )
 
 parser.add_argument(
@@ -100,9 +102,9 @@ parser.add_argument(
 )
 
 parser.add_argument(
-    '-P',
+    '-t', '--terminal',
     action='store_true',
-    help="Don't prepend a potentially unsafe path to sys.path (python sys.path)"
+    help="Configure terminal encoding to UTF-8 and enable ANSI escape code processing on Windows"
 )
 
 parser.add_argument(
@@ -111,6 +113,18 @@ parser.add_argument(
     help="Don't print version and copyright messages on interactive startup"
 )
 
+parser.add_argument(
+    '-v', '-V', '--version',
+    action='version',
+    version=f"PyScript {__version__}",
+)
+
+parser.add_argument(
+    '-P',
+    action='store_true',
+    help="Don't prepend a potentially unsafe path to sys.path (python sys.path)"
+)
+
 parser.add_argument(
     'file',
     type=str,
@@ -131,8 +145,26 @@ def argument_error(argument, message):
 
 args = parser.parse_args()
 
+if args.terminal:
+
+    for fd in (sys.stdout, sys.stderr, sys.stdin):
+        try:
+            fd.reconfigure(encoding='utf-8')
+        except:
+            continue
+
+    if sys.platform == 'win32':
+        try:
+            import ctypes
+            kernel32 = ctypes.windll.kernel32
+            kernel32.SetConsoleMode(kernel32.GetStdHandle(-11), 7) # stdout
+            kernel32.SetConsoleMode(kernel32.GetStdHandle(-12), 7) # stderr
+            kernel32.SetConsoleMode(kernel32.GetStdHandle(-10), 7) # stdin
+        except:
+            pass
+
 if args.file is None:
-    if args.editor:
+    if EDITOR_MAP and args.editor:
         argument_error('-e/--editor', "argument 'file' is required")
     elif args.highlight:
         argument_error('-l/--highlight', "argument 'file' is required")
@@ -156,6 +188,7 @@ if args.P:
 if args.q:
     flags |= DONT_SHOW_BANNER_ON_SHELL
 
+hook.argv = ['']
 hook.argv[1:] = args.argv
 
 if args.file is not None:
@@ -166,7 +199,7 @@ if args.file is not None:
         with open(path, 'r', encoding='utf-8') as file:
             file = PysFileBuffer(file, path)
     except FileNotFoundError:
-        if args.editor:
+        if EDITOR_MAP and args.editor:
             file = PysFileBuffer('', path)
         else:
             parser.error(f"can't open file {path!r}: No such file or directory")
@@ -183,13 +216,9 @@ if args.file is not None:
     except BaseException as e:
         parser.error(f"file {path!r}: Unexpected error: {e}")
 
-    if args.editor:
+    if EDITOR_MAP and args.editor:
         try:
-            if args.editor == 'gui':
-                editor = PysGUIEditor
-            elif args.editor == 'terminal':
-                editor = PysTerminalEditor
-            editor(file).run()
+            EDITOR_MAP[args.editor](file).run()
         except BaseException as e:
             argument_error('-e/--editor', e)
 
@@ -230,7 +259,7 @@ if args.file is not None:
             else:
                 code = pys_shell(
                     globals=result.context.symbol_table,
-                    flags=result.context.flags,
+                    flags=result.context.flags | DONT_SHOW_BANNER_ON_SHELL,
                     parser_flags=result.parser_flags
                 )
 
@@ -238,12 +267,25 @@ elif args.command is not None:
     hook.argv[0] = '-c'
 
     file = PysFileBuffer(args.command, '<arg-command>')
-    code = pys_runner(
+    result = pys_runner(
         file=file,
         mode='exec',
         symbol_table=_normalize_namespace(file, undefined),
         flags=flags
-    ).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)
+            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
+            )
 
 else:
     code = pys_shell(

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/analyzer.py

@@ -159,7 +159,7 @@ class PysAnalyzer(Pys):
 
     def visit_IncrementalNode(self, node):
         operator = 'increase' if node.operand.type == TOKENS['DOUBLE-PLUS'] else 'decrease'
-        self.visit_declaration_AssignNode(node.target, f"cannot {operator} literal", operator)
+        self.visit_declaration_AssignmentNode(node.target, f"cannot {operator} literal", operator)
 
     def visit_StatementsNode(self, node):
         for element in node.body:
@@ -167,9 +167,11 @@ class PysAnalyzer(Pys):
             if self.error:
                 return
 
-    def visit_AssignNode(self, node):
-        self.visit_declaration_AssignNode(node.target,
-                                          "cannot assign to expression here. Maybe you meant '==' instead of '='?")
+    def visit_AssignmentNode(self, node):
+        self.visit_declaration_AssignmentNode(
+            node.target,
+            "cannot assign to expression here. Maybe you meant '==' instead of '='?"
+        )
         if self.error:
             return
 
@@ -259,7 +261,7 @@ class PysAnalyzer(Pys):
         if len(node.header) == 2:
             declaration, iteration = node.header
 
-            self.visit_declaration_AssignNode(declaration, "cannot assign to expression")
+            self.visit_declaration_AssignmentNode(declaration, "cannot assign to expression")
             if self.error:
                 return
 
@@ -503,7 +505,7 @@ class PysAnalyzer(Pys):
         else:
             self.visit(nslice)
 
-    def visit_declaration_AssignNode(self, node, message, operator_name='assign'):
+    def visit_declaration_AssignmentNode(self, node, message, operator_name='assign'):
         type = node.__class__
 
         if type is PysAttributeNode:
@@ -518,7 +520,7 @@ class PysAnalyzer(Pys):
 
         elif is_list(type):
             for element in node.elements:
-                self.visit_declaration_AssignNode(element, message, operator_name)
+                self.visit_declaration_AssignmentNode(element, message, operator_name)
                 if self.error:
                     return
 

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/checks.py

@@ -9,7 +9,7 @@ is_expression = frozenset([
 ]).__contains__
 
 is_statement = frozenset([
-    PysStatementsNode, PysAssignNode, PysImportNode, PysIfNode, PysSwitchNode, PysTryNode, PysWithNode, PysForNode,
+    PysStatementsNode, PysAssignmentNode, PysImportNode, PysIfNode, PysSwitchNode, PysTryNode, PysWithNode, PysForNode,
     PysWhileNode, PysDoWhileNode, PysRepeatNode, PysClassNode, PysGlobalNode, PysReturnNode, PysThrowNode,
     PysAssertNode, PysDeleteNode, PysContinueNode, PysBreakNode
 ]).__contains__

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/constants.py

@@ -6,7 +6,7 @@ PYSCRIPT_PATH = sep.join(__file__.split(sep)[:-2])
 CORE_PATH = join(PYSCRIPT_PATH, 'core')
 LIBRARIES_PATH = join(PYSCRIPT_PATH, 'lib')
 SITE_PACKAGES_PATH = join(PYSCRIPT_PATH, 'site-packages')
-OTHER_PATH = join(CORE_PATH, 'other')
+OTHER_PATH = join(PYSCRIPT_PATH, 'other')
 ICON_PATH = join(OTHER_PATH, 'PyScript.ico')
 
 # environment variables

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/editor/gui.py

@@ -127,6 +127,8 @@ try:
             self.text.configure(wrap='char' if self.wrapped else 'none')
             return 'break'
 
+    GUI_SUPPORT = True
+
 except ImportError as e:
     _error = e
 
@@ -134,6 +136,7 @@ except ImportError as e:
         def __new__(cls, *args, **kwargs):
             raise ImportError(
                 "cannot import module tkinter. Did you forgot install separate tkinter module or "
-                "not check the option for tkinter during python installation?: " +
-                str(_error)
-            ) from _error
+                f"not check the option for tkinter during python installation?: {_error}"
+            ) from _error
+
+    GUI_SUPPORT = False

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/editor/terminal.py

@@ -140,9 +140,13 @@ try:
                 title = file
             return ANSI(f'\x1b[7m{title}{" " * max(0, columns - len(title))}\x1b[0m')
 
+    TERMINAL_SUPPORT = True
+
 except ImportError as e:
     _error = e
 
     class PysTerminalEditor(PysEditor):
         def __new__(cls, *args, **kwargs):
-            raise ImportError(f"cannot import module prompt_toolkit: {_error}") from _error
+            raise ImportError(f"cannot import module prompt_toolkit: {_error}") from _error
+
+    TERMINAL_SUPPORT = False

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/handlers.py

@@ -4,6 +4,8 @@ from .objects import PysFunction
 from os import environ
 from types import MethodType
 
+wrapper_function = (MethodType, classmethod, staticmethod)
+
 if environ.get(ENV_PYSCRIPT_NO_GIL) is None:
     from threading import RLock
 
@@ -11,21 +13,24 @@ if environ.get(ENV_PYSCRIPT_NO_GIL) is None:
 
     def handle_call(object, context, position):
         with lock:
+            ins = isinstance
 
-            if isinstance(object, PysFunction):
+            if ins(object, PysFunction):
                 code = object.__code__
                 code.context = context
                 code.position = position
 
-            elif isinstance(object, MethodType):
+            elif ins(object, wrapper_function):
                 handle_call(object.__func__, context, position)
 
-            elif isinstance(object, type):
-                method = getattr(object, '__new__', None)
+            elif ins(object, type):
+                gt = getattr
+
+                method = gt(object, '__new__', None)
                 if method is not None:
                     handle_call(method, context, position)
 
-                method = getattr(object, '__init__', None)
+                method = gt(object, '__init__', None)
                 if method is not None:
                     handle_call(method, context, position)
 
@@ -33,20 +38,24 @@ if environ.get(ENV_PYSCRIPT_NO_GIL) is None:
 else:
 
     def handle_call(object, context, position):
-        if isinstance(object, PysFunction):
+        ins = isinstance
+
+        if ins(object, PysFunction):
             code = object.__code__
             code.context = context
             code.position = position
 
-        elif isinstance(object, MethodType):
+        elif ins(object, wrapper_function):
             handle_call(object.__func__, context, position)
 
-        elif isinstance(object, type):
-            method = getattr(object, '__new__', None)
+        elif ins(object, type):
+            gt = getattr
+
+            method = gt(object, '__new__', None)
             if method is not None:
                 handle_call(method, context, position)
 
-            method = getattr(object, '__init__', None)
+            method = gt(object, '__init__', None)
             if method is not None:
                 handle_call(method, context, position)
 

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/interpreter.py

@@ -10,7 +10,7 @@ from .objects import PysFunction
 from .pysbuiltins import ce, nce, increment, decrement
 from .results import PysRunTimeResult
 from .symtab import PysClassSymbolTable, find_closest
-from .utils.generic import getattribute, setimuattr, is_object_of, get_error_args
+from .utils.generic import getattribute, setimuattr, dkeys, is_object_of, get_error_args
 from .utils.similarity import get_closest
 
 from collections.abc import Iterable
@@ -386,14 +386,13 @@ def visit_IncrementalNode(node, context):
         return result
 
     with result(context, nposition):
-        func = get_incremental_function(node.operand.type)
+        handle_call(function := get_incremental_function(node.operand.type), context, nposition)
+        increast_value = function(value)
 
-        handle_call(func, context, nposition)
-        increast_value = func(value)
         if node.operand_position == 'left':
             value = increast_value
 
-        register(visit_declaration_AssignNode(ntarget, context, increast_value))
+        register(visit_declaration_AssignmentNode(ntarget, context, increast_value))
         if should_return():
             return result
 
@@ -424,7 +423,7 @@ def visit_StatementsNode(node, context):
 
     return result.success(None)
 
-def visit_AssignNode(node, context):
+def visit_AssignmentNode(node, context):
     result = PysRunTimeResult()
 
     register = result.register
@@ -435,7 +434,7 @@ def visit_AssignNode(node, context):
     if should_return():
         return result
 
-    register(visit_declaration_AssignNode(node.target, context, value, node.operand.type))
+    register(visit_declaration_AssignmentNode(node.target, context, value, node.operand.type))
     if should_return():
         return result
 
@@ -849,8 +848,7 @@ def visit_ForNode(node, context):
 
         with result(context, niteration_position):
             handle_call(getattr(iteration, '__iter__', None), context, niteration_position)
-            iteration = iter(iteration)
-            next = iteration.__next__
+            next = iter(iteration).__next__
 
         if should_return():
             return result
@@ -858,7 +856,7 @@ def visit_ForNode(node, context):
         def condition():
             with result(context, niteration_position):
                 handle_call(next, context, niteration_position)
-                register(visit_declaration_AssignNode(ndeclaration, context, next()))
+                register(visit_declaration_AssignmentNode(ndeclaration, context, next()))
 
             if should_return():
                 if result.error and is_object_of(result.error.exception, StopIteration):
@@ -1144,7 +1142,7 @@ def visit_FunctionNode(node, context):
         else:
             append(nparameter.value)
 
-    func = PysFunction(
+    function = PysFunction(
         name=name,
         qualname=context.qualname,
         parameters=parameters,
@@ -1162,18 +1160,18 @@ def visit_FunctionNode(node, context):
 
         with result(context, dposition):
             handle_call(decorator, context, dposition)
-            func = decorator(func)
+            function = decorator(function)
 
         if should_return():
             return result
 
     if name:
         with result(context, nposition):
-            context.symbol_table.set(name, func)
+            context.symbol_table.set(name, function)
         if should_return():
             return result
 
-    return result.success(func)
+    return result.success(function)
 
 def visit_GlobalNode(node, context):
     context.symbol_table.globals.update(name.value for name in node.identifiers)
@@ -1306,7 +1304,7 @@ def visit_DeleteNode(node, context):
             with result(context, target_position):
 
                 if not symbol_table.remove(name):
-                    closest_symbol = get_closest(symbol_table.symbols.keys(), name)
+                    closest_symbol = get_closest(dkeys(symbol_table.symbols), name)
 
                     return result.failure(
                         PysTraceback(
@@ -1417,7 +1415,7 @@ def visit_slice_SubscriptNode(node, context):
 
         return result.success(value)
 
-def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
+def visit_declaration_AssignmentNode(node, context, value, operand=TOKENS['EQUAL']):
     result = PysRunTimeResult()
 
     register = result.register
@@ -1431,7 +1429,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
         with result(context, node.position):
 
             if not symbol_table.set(name, value, operand=operand):
-                closest_symbol = get_closest(symbol_table.symbols.keys(), name)
+                closest_symbol = get_closest(dkeys(symbol_table.symbols), name)
 
                 result.failure(
                     PysTraceback(
@@ -1510,7 +1508,7 @@ def visit_declaration_AssignNode(node, context, value, operand=TOKENS['EQUAL']):
         with result(context, position):
 
             for element, element_value in zip(elements, value):
-                register(visit_declaration_AssignNode(element, context, element_value, operand))
+                register(visit_declaration_AssignmentNode(element, context, element_value, operand))
                 if should_return():
                     return result
 

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/lexer.py

@@ -58,8 +58,8 @@ class PysLexer(Pys):
         while self.read_more():
 
             if self.current_character == '\n':
-                self.add_token(TOKENS['NEWLINE'])
                 self.advance()
+                self.add_token(TOKENS['NEWLINE'])
 
             elif self.current_character == '\\':
                 self.make_back_slash()
@@ -128,49 +128,50 @@ class PysLexer(Pys):
                 self.make_comment()
 
             elif self.current_character == '(':
-                self.add_token(TOKENS['LEFT-PARENTHESIS'])
                 self.advance()
+                self.add_token(TOKENS['LEFT-PARENTHESIS'])
 
             elif self.current_character == ')':
-                self.add_token(TOKENS['RIGHT-PARENTHESIS'])
                 self.advance()
+                self.add_token(TOKENS['RIGHT-PARENTHESIS'])
 
             elif self.current_character == '[':
-                self.add_token(TOKENS['LEFT-SQUARE'])
                 self.advance()
+                self.add_token(TOKENS['LEFT-SQUARE'])
 
             elif self.current_character == ']':
-                self.add_token(TOKENS['RIGHT-SQUARE'])
                 self.advance()
+                self.add_token(TOKENS['RIGHT-SQUARE'])
 
             elif self.current_character == '{':
-                self.add_token(TOKENS['LEFT-CURLY'])
                 self.advance()
+                self.add_token(TOKENS['LEFT-CURLY'])
 
             elif self.current_character == '}':
-                self.add_token(TOKENS['RIGHT-CURLY'])
                 self.advance()
+                self.add_token(TOKENS['RIGHT-CURLY'])
 
             elif self.current_character == ',':
-                self.add_token(TOKENS['COMMA'])
                 self.advance()
+                self.add_token(TOKENS['COMMA'])
 
             elif self.current_character == ';':
-                self.add_token(TOKENS['SEMICOLON'])
                 self.advance()
+                self.add_token(TOKENS['SEMICOLON'])
 
             else:
-                char = self.current_character
-                unicode = ord(char)
+                character = self.current_character
+                unicode = ord(character)
 
                 self.advance()
                 self.throw(
                     self.index - 1, self.index,
-                    f"invalid character '{char}' (U+{unicode:04X})"
-                    if char.isprintable() else
+                    f"invalid character '{character}' (U+{unicode:04X})"
+                    if character.isprintable() else
                     f"invalid non-printable character U+{unicode:04X}"
                 )
 
+        self.advance()
         self.add_token(TOKENS['NULL'])
 
         return (None if self.tokens is None else tuple(self.tokens)), self.error
@@ -201,8 +202,8 @@ class PysLexer(Pys):
         if self.error is None and self.tokens is not None:
 
             if start is None:
-                start = self.index
-                end = self.index + 1
+                start = self.index - 1
+                end = self.index
             else:
                 end = self.index
 

{pyscript_programming_language-1.11.2 → pyscript_programming_language-1.11.3}/pyscript/core/nodes.py

@@ -294,7 +294,7 @@ class PysStatementsNode(PysNode):
     def __repr__(self) -> str:
         return f'Statements(body={self.body!r})'
 
-class PysAssignNode(PysNode):
+class PysAssignmentNode(PysNode):
 
     __slots__ = ('target', 'operand', 'value')
 
@@ -306,7 +306,7 @@ class PysAssignNode(PysNode):
         setimuattr(self, 'value', value)
 
     def __repr__(self) -> str:
-        return f'Assign(target={self.target!r}, operand={self.operand!r}, value={self.value!r})'
+        return f'Assignment(target={self.target!r}, operand={self.operand!r}, value={self.value!r})'
 
 class PysImportNode(PysNode):