Nuitka-winsvc 2.2.3__cp311-cp311-win_amd64.whl → 2.3.2__cp311-cp311-win_amd64.whl

nuitka/nodes/ModuleNodes.py

@@ -20,6 +20,7 @@ from nuitka.PythonVersions import python_version
 from nuitka.SourceCodeReferences import fromFilename
 from nuitka.tree.SourceHandling import parsePyIFile, readSourceCodeFromFilename
 from nuitka.utils.CStrings import encodePythonIdentifierToC
+from nuitka.utils.Importing import getSharedLibrarySuffix
 from nuitka.utils.ModuleNames import ModuleName
 
 from .ChildrenHavingMixins import (
@@ -971,13 +972,14 @@ class PythonMainModule(CompiledPythonModule):
 class PythonExtensionModule(PythonModuleBase):
     kind = "PYTHON_EXTENSION_MODULE"
 
-    __slots__ = ("used_modules", "technical")
+    __slots__ = ("used_modules", "module_filename", "technical")
 
     avoid_duplicates = set()
 
     def __init__(
         self,
         module_name,
+        module_filename,
         reason,
         technical,
         source_ref,
@@ -1005,11 +1007,17 @@ class PythonExtensionModule(PythonModuleBase):
 
         self.used_modules = None
 
+        if os.path.isdir(module_filename):
+            module_filename = os.path.join(
+                module_filename, "__init__" + getSharedLibrarySuffix(preferred=False)
+            )
+        self.module_filename = module_filename
+
     def finalize(self):
         del self.used_modules
 
     def getFilename(self):
-        return self.source_ref.getFilename()
+        return self.module_filename
 
     @staticmethod
     def startTraversal():

nuitka/nodes/OsSysNodes.py

@@ -112,6 +112,22 @@ class ExpressionOsPathAbspathCall(ExpressionOsPathAbspathCallBase):
         return self, None, None
 
 
+class ExpressionOsPathNormpathCall(ExpressionOsPathAbspathCallBase):
+    kind = "EXPRESSION_OS_PATH_NORMPATH_CALL"
+
+    def replaceWithCompileTimeValue(self, trace_collection):
+        result = makeConstantRefNode(
+            constant=os.path.normpath(self.subnode_path.getCompileTimeConstant()),
+            source_ref=self.source_ref,
+        )
+
+        return (
+            result,
+            "new_expression",
+            "Compile time resolved 'os.path.normpath' call.",
+        )
+
+
 class ExpressionOsPathIsabsCall(ExpressionOsPathIsabsCallBase):
     kind = "EXPRESSION_OS_PATH_ISABS_CALL"
 

nuitka/nodes/SubscriptNodes.py

@@ -118,13 +118,13 @@ def hasSubscript(value, subscript):
         return True
 
 
-class ExpressionSubscriptCheck(
+class ExpressionMatchSubscriptCheck(
     ExpressionBoolShapeExactMixin,
     SideEffectsFromChildrenMixin,
     ChildrenHavingExpressionSubscriptMixin,
     ExpressionBase,
 ):
-    kind = "EXPRESSION_SUBSCRIPT_CHECK"
+    kind = "EXPRESSION_MATCH_SUBSCRIPT_CHECK"
 
     named_children = ("expression", "subscript")
 
@@ -153,7 +153,7 @@ class ExpressionSubscriptCheck(
                 computation=lambda: hasSubscript(
                     source.getCompileTimeConstant(), subscript.getCompileTimeConstant()
                 ),
-                description="Subscript check has been pre-computed.",
+                description="Subscript match check has been pre-computed.",
             )
 
             # If source has side effects, they must be evaluated.

nuitka/plugins/PluginBase.py

@@ -895,6 +895,7 @@ Unwanted import of '%(unwanted)s' that %(problem)s '%(binding_name)s' encountere
         ignore_suffixes=(),
         only_suffixes=(),
         normalize=True,
+        raw=False,
     ):
         return makeIncludedDataDirectory(
             source_path=source_path,
@@ -907,6 +908,7 @@ Unwanted import of '%(unwanted)s' that %(problem)s '%(binding_name)s' encountere
             ignore_suffixes=ignore_suffixes,
             only_suffixes=only_suffixes,
             normalize=normalize,
+            raw=raw,
         )
 
     def makeIncludedEmptyDirectory(self, dest_path, reason, tags):

nuitka/plugins/standard/DataFilesPlugin.py

@@ -120,7 +120,7 @@ class NuitkaPluginDataFileCollector(NuitkaYamlPluginBase):
         if dirs is not None:
             if type(dirs) is not list or not dirs:
                 self.sysexit(
-                    "Error, requiring list below 'empty_dirs_structure' entry for '%s' entry."
+                    "Error, requiring list below 'dirs' entry for '%s' entry."
                     % module_name
                 )
 
@@ -136,6 +136,27 @@ class NuitkaPluginDataFileCollector(NuitkaYamlPluginBase):
                         tags="config",
                     )
 
+        raw_dirs = data_file_config.get("raw_dirs")
+        if raw_dirs is not None:
+            if type(raw_dirs) is not list or not raw_dirs:
+                self.sysexit(
+                    "Error, requiring list below 'raw_dirs' entry for '%s' entry."
+                    % module_name
+                )
+
+            for raw_dir in raw_dirs:
+                source_path = os.path.join(module_folder, raw_dir)
+
+                if os.path.isdir(source_path):
+                    yield self.makeIncludedDataDirectory(
+                        source_path=source_path,
+                        dest_path=os.path.join(target_dir, raw_dir),
+                        reason="package raw directory '%s' for %r"
+                        % (raw_dir, module_name.asString()),
+                        tags="config",
+                        raw=True,
+                    )
+
         include_pyi_file = data_file_config.get("include-pyi-file")
 
         if include_pyi_file == "yes":

nuitka/plugins/standard/DillPlugin/DillPlugin.c

@@ -11,12 +11,12 @@ void registerDillPluginTables(PyThreadState *tstate, char const *module_name, Py
     if (function_tables == NULL) {
         CLEAR_ERROR_OCCURRED(tstate);
 
-        function_tables = MAKE_DICT_EMPTY();
+        function_tables = MAKE_DICT_EMPTY(tstate);
         PyObject_SetAttrString((PyObject *)builtin_module, "compiled_function_tables", function_tables);
     }
 
-    PyObject *funcs =
-        MAKE_TUPLE2_0(PyCFunction_New(reduce_compiled_function, NULL), PyCFunction_New(create_compiled_function, NULL));
+    PyObject *funcs = MAKE_TUPLE2_0(tstate, PyCFunction_New(reduce_compiled_function, NULL),
+                                    PyCFunction_New(create_compiled_function, NULL));
 
     PyDict_SetItemString(function_tables, module_name, funcs);
 }

nuitka/plugins/standard/ImplicitImports.py

@@ -653,6 +653,9 @@ According to Yaml 'overridden-environment-variables' configuration."""
         "asyncua.ua.object_ids",  # Too large generated code
         "asyncua.ua.uaerrors._auto",  # Too large generated code
         "asyncua.server.standard_address_space.standard_address_space_services",  # Too large generated code
+        "opcua.ua.object_ids",  # Too large generated code
+        "opcua.ua.uaerrors._auto",  # Too large generated code
+        "opcua.server.server.standard_address_space",
         "azure.mgmt.network",  # Too large generated code
         "azure.mgmt.compute",  # Too large generated code
         "transformers.utils.dummy_pt_objects",  # Not performance relevant.

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -11,9 +11,7 @@ console is disabled. This reads Yaml configuration.
 from nuitka.Options import (
     isOnefileMode,
     isStandaloneMode,
-    mayDisableConsoleWindow,
     shallCreateAppBundle,
-    shallDisableConsoleWindow,
 )
 from nuitka.plugins.PluginBase import NuitkaYamlPluginBase
 from nuitka.utils.Utils import isMacOS
@@ -72,37 +70,6 @@ class NuitkaPluginOptionsNanny(NuitkaYamlPluginBase):
                 % full_name.asString()
             )
 
-    def _checkConsoleMode(self, full_name, console):
-        if console == "no":
-            if shallDisableConsoleWindow() is not True:
-                self.sysexit(
-                    "Error, when using '%s', you have to use '--disable-console' option."
-                    % full_name
-                )
-        elif console == "yes":
-            pass
-        elif console == "recommend":
-            if shallDisableConsoleWindow() is None:
-                if isMacOS():
-                    downside_message = """\
-Otherwise high resolution will not be available and a terminal window will open"""
-                else:
-                    downside_message = """\
-Otherwise a terminal window will open"""
-
-                self.info(
-                    """\
-Note, when using '%s', consider using '--disable-console' option. %s. However \
-for debugging, terminal output is the easiest way to see informative traceback \
-and error information, so delay this until your program is working and remove \
-once you find it non-working, and use '--enable-console' to make it explicit \
-and not see this message."""
-                    % (full_name, downside_message)
-                )
-
-        else:
-            self.sysexitIllegalOptionValue(full_name, "console", console)
-
     def _checkMacOSBundleMode(self, full_name, macos_bundle):
         if macos_bundle == "yes":
             if isStandaloneMode() and not shallCreateAppBundle():
@@ -114,8 +81,15 @@ Error, package '%s' requires '--macos-create-app-bundle' to be used or else it c
         elif macos_bundle == "no":
             pass
         elif macos_bundle == "recommend":
-            # TODO: Not really recommending with a message it yet.
-            pass
+            self.info(
+                """\
+Note, when using '%s', consider using '--macos-create-app-bundle' option. \
+Otherwise high resolution will not be available and a terminal window will \
+open. However for debugging, terminal output is the easiest way to see \
+informative traceback and error information, so launch it from there if \
+possible."""
+                % full_name
+            )
         else:
             self.sysexitIllegalOptionValue(full_name, "macos_bundle", macos_bundle)
 
@@ -151,12 +125,6 @@ Error, package '%s' requires '--onefile' to be used on top of '--macos-create-ap
                         condition=condition,
                     )
 
-                    if mayDisableConsoleWindow():
-                        self._checkConsoleMode(
-                            full_name=full_name,
-                            console=check.get("console", "yes"),
-                        )
-
                     if isMacOS():
                         self._checkMacOSBundleMode(
                             full_name=full_name,

nuitka/plugins/standard/PkgResourcesPlugin.py

@@ -52,8 +52,14 @@ class NuitkaPluginResources(NuitkaPluginBase):
 
             for entry_point in dist.entry_points:
                 if entry_point.group == group and entry_point.name == name:
-                    module_name = entry_point.module
-                    main_name = entry_point.attr
+                    try:
+                        module_name = entry_point.module
+                        main_name = entry_point.attr
+                    except AttributeError:
+                        match = entry_point.pattern.match(entry_point.value)
+
+                        module_name = match.group("module")
+                        main_name = match.group("attr")
 
                     break
 

nuitka/plugins/standard/PySidePyQtPlugin.py

@@ -1459,6 +1459,9 @@ it for full compatible behavior with the uncompiled code to debug it."""
 
                 return (False, "Not included due to all Qt bindings disallowed.")
 
+    def getEvaluationConditionControlTags(self):
+        return {"use_noqt": True}
+
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.

nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -446,10 +446,12 @@
         'is_triton_available()': 'False'
       when: 'not use_setuptools'
 
-- module-name: 'bokeh' # checksum: e1035750
+- module-name: 'bokeh' # checksum: cd9c2e63
   data-files:
     dirs:
       - '_sri'
+    patterns:
+      - '_sri.json'
 
 - module-name: 'bokeh.core' # checksum: 3dbea61d
   data-files:
@@ -1273,6 +1275,12 @@
         macos_bundle: 'yes'
         when: 'macos'
 
+- module-name: 'freetype' # checksum: 5a9431c2
+  dlls:
+    - from_filenames:
+        prefixes:
+          - 'libfreetype'
+
 - module-name: 'frozendict' # checksum: 85584475
   data-files:
     patterns:
@@ -1816,6 +1824,13 @@
       replacements_plain:
         'from keras.testing_infra.test_utils import layer_test': ''
 
+- module-name: 'keras.src' # checksum: 9760fd72
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'from keras.src.testing_infra import test_utils': 'test_utils = None'
+      when: 'not use_unittest'
+
 - module-name: 'keras.src.utils.vis_utils' # checksum: 7d07a2d1
   anti-bloat:
     - description: 'remove IPython reference'
@@ -3688,7 +3703,7 @@
     dirs:
       - '.'
 
-- module-name: 'pygame' # checksum: 74ba6d7b
+- module-name: 'pygame' # checksum: 5fbb83cf
   data-files:
     patterns:
       - 'freesansbold.ttf'
@@ -3696,7 +3711,7 @@
   options:
     checks:
       - description: 'PyGame is a GUI framework'
-        console: 'recommend'
+        macos_bundle: 'recommend'
 
 - module-name: 'pygame_menu' # checksum: 3f9f0b7d
   data-files:
@@ -3814,7 +3829,7 @@
     dirs:
       - 'proj_dir'
 
-- module-name: 'PyQt5' # checksum: c7182cc5
+- module-name: 'PyQt5' # checksum: 8ca4bbdf
   data-files:
     empty_dirs:
       - 'Qt5'
@@ -3823,7 +3838,7 @@
   options:
     checks:
       - description: 'PyQt5 is a GUI framework'
-        console: 'recommend'
+        macos_bundle: 'recommend'
         when: 'use_pyqt5'
       - description: 'PyQt5 cannot be used without bundle'
         macos_bundle: 'yes'
@@ -3836,11 +3851,11 @@
     - acceptable-missing-dlls:
         - 'libqpdf'
 
-- module-name: 'PyQt6' # checksum: 884033ec
+- module-name: 'PyQt6' # checksum: 9ddfb6bb
   options:
     checks:
       - description: 'PyQt6 is a GUI framework'
-        console: 'recommend'
+        macos_bundle: 'recommend'
         when: 'use_pyqt6'
       - description: 'PyQt6 on macOS is not supported, use PySide6 instead'
         support_info: 'error'
@@ -3990,7 +4005,7 @@
         prefixes:
           - 'libcvhf'
 
-- module-name: 'PySide2' # checksum: 4e71be92
+- module-name: 'PySide2' # checksum: c07d1551
   implicit-imports:
     - post-import-code:
         - |
@@ -4009,7 +4024,7 @@
   options:
     checks:
       - description: 'PySide2 is a GUI framework'
-        console: 'recommend'
+        macos_bundle: 'recommend'
         when: 'use_pyside2'
       - description: 'PySide2 cannot be signed unless onefile'
         macos_bundle_as_onefile: 'yes'
@@ -4018,7 +4033,7 @@
     - find-dlls-near-module:
         - 'shiboken2'
 
-- module-name: 'PySide6' # checksum: 8852cddf
+- module-name: 'PySide6' # checksum: a87b6b1
   implicit-imports:
     - post-import-code:
         - |
@@ -4056,7 +4071,7 @@
   options:
     checks:
       - description: 'PySide6 is a GUI framework'
-        console: 'recommend'
+        macos_bundle: 'recommend'
         when: 'use_pyside6'
 
   import-hacks:
@@ -7372,11 +7387,11 @@
     - depends:
         - '._noop'
 
-- module-name: 'wx' # checksum: 154e95cb
+- module-name: 'wx' # checksum: 9a4d4164
   options:
     checks:
       - description: 'wx will crash in console mode during startup'
-        console: 'yes'
+        macos_bundle: 'yes'
         when: 'macos'
       - description: 'wx requires program to be in bundle form'
         macos_bundle: 'yes'

nuitka/plugins/standard/stdlib2.nuitka-package.config.yml

@@ -59,10 +59,10 @@
       change_function:
         'test': "'(lambda: None)'"
 
-- module-name: 'Tkinter' # checksum: 16ff58dd
+- module-name: 'Tkinter' # checksum: 6eaa6fb1
   options:
     checks:
-      - console: 'recommend'
+      - macos_bundle: 'recommend'
         when: 'plugin("tk-inter")'
 
 - module-name: 'xml.sax.xmlreader' # checksum: 167cb032

nuitka/plugins/standard/stdlib3.nuitka-package.config.yml

@@ -9,6 +9,11 @@
     - depends:
         - 'asyncio'
 
+- module-name: '_osx_support' # checksum: e893ad4b
+  anti-bloat:
+    - no-auto-follow:
+        'distutils': 'ignore'
+
 - module-name: '_zoneinfo' # checksum: 8de2a2bd
   implicit-imports:
     - depends:
@@ -320,7 +325,7 @@
       change_function:
         '_test': "'(lambda: None)'"
 
-- module-name: 'tkinter' # checksum: cef6b613
+- module-name: 'tkinter' # checksum: 481f7b98
   anti-bloat:
     - description: 'enhanced tk-inter in case of missing tcl'
       context:
@@ -338,7 +343,7 @@
       when: 'not deployment and not plugin("tk-inter")'
   options:
     checks:
-      - console: 'recommend'
+      - macos_bundle: 'recommend'
         when: 'plugin("tk-inter")'
 
 - module-name: 'tokenize' # checksum: 6a44b57d

nuitka/specs/HardImportSpecs.py

@@ -131,6 +131,9 @@ os_path_basename_spec = BuiltinParameterSpec(
     "os.path.basename", ("p",), default_count=0
 )
 os_path_dirname_spec = BuiltinParameterSpec("os.path.dirname", ("p",), default_count=0)
+os_path_normpath_spec = BuiltinParameterSpec(
+    "os.path.normpath", ("path",), default_count=0
+)
 os_path_abspath_spec = BuiltinParameterSpec(
     "os.path.abspath", ("path",), default_count=0
 )

nuitka/specs/ParameterSpecs.py

@@ -391,24 +391,30 @@ def matchCall(
             try:
                 arg_index = (args + kw_only_args).index(pair[0])
             except ValueError:
-                if improved or python_version >= 0x370:
-                    message = "'%s' is an invalid keyword argument for %s()" % (
-                        pair[0],
-                        func_name,
-                    )
+                if python_version < 0x370 and not improved:
+                    template = "'%(arg_name)s' is an invalid keyword argument for this function"
+                elif python_version < 0x3D0 and not improved:
+                    template = "'%(arg_name)s' is an invalid keyword argument for %(func_name)s()"
                 else:
-                    message = (
-                        "'%s' is an invalid keyword argument for this function"
-                        % pair[0]
-                    )
+                    template = "%(func_name)s() got an unexpected keyword argument '%(arg_name)s'"
+
+                message = template % {
+                    "arg_name": pair[0],
+                    "func_name": func_name,
+                }
 
                 raise TooManyArguments(TypeError(message))
 
             if arg_index < num_pos_only:
-                message = "'%s' is an invalid keyword argument for %s()" % (
-                    pair[0],
-                    func_name,
-                )
+                if python_version < 0x3D0:
+                    template = "'%(arg_name)s' is an invalid keyword argument for %(func_name)s()"
+                else:
+                    template = "%(func_name)s() got an unexpected keyword argument '%(arg_name)s'"
+
+                message = template % {
+                    "arg_name": pair[0],
+                    "func_name": func_name,
+                }
 
                 raise TooManyArguments(TypeError(message))
 
@@ -446,9 +452,14 @@ def matchCall(
                 )
             )
 
+        if python_version < 0x3D0:
+            template = "%s() takes at most %d %s (%d given)"
+        else:
+            template = "%s expected at most %d %s, got %d"
+
         raise TooManyArguments(
             TypeError(
-                "%s() takes at most %d %s (%d given)"
+                template
                 % (
                     func_name,
                     num_args,
@@ -507,7 +518,7 @@ def matchCall(
     elif pairs:
         unexpected = next(iter(dict(pairs)))
 
-        if improved:
+        if improved or python_version >= 0x3D0:
             message = "%s() got an unexpected keyword argument '%s'" % (
                 func_name,
                 unexpected,

nuitka/tools/general/find_module/FindModuleCode.py

@@ -20,6 +20,7 @@ from nuitka.importing.Importing import (
 from nuitka.Tracing import tools_logger
 from nuitka.utils.Execution import callProcess, getExecutablePath
 from nuitka.utils.FileOperations import relpath
+from nuitka.utils.Importing import getPackageDirFilename
 from nuitka.utils.Utils import isWin32Windows
 
 
@@ -76,9 +77,9 @@ def editModuleCode(module_search_desc):
         tools_logger.sysexit("Error, did not find '%s' module" % module_name)
     else:
         if os.path.isdir(module_filename):
-            candidate = os.path.join(module_filename, ("__init__.py"))
+            candidate = getPackageDirFilename(module_filename)
 
-            if os.path.isfile(candidate):
+            if candidate is not None:
                 module_filename = candidate
 
         if os.path.isdir(module_filename):

nuitka/tools/specialize/CTypeDescriptions.py

@@ -670,8 +670,11 @@ return %(return_value)s;""" % {
             )
 
     @staticmethod
-    def getTakeReferenceStatement(operand):
-        return "Py_INCREF(%s);" % operand
+    def getTakeReferenceStatement(operand, immortal):
+        return "%s(%s);" % (
+            ("Py_INCREF_IMMORTAL" if immortal else "Py_INCREF"),
+            operand,
+        )
 
     @classmethod
     def hasReferenceCounting(cls):
@@ -764,10 +767,9 @@ return %(return_value)s;""" % {
     @classmethod
     def getAssignFromBoolExpressionCode(cls, result, operand, give_ref):
         if cls.type_name == "object":
-            # TODO: Python3?
             code = "%s = BOOL_FROM(%s);" % (result, operand)
             if give_ref:
-                code += "Py_INCREF(%s);" % result
+                code += "Py_INCREF_IMMORTAL(%s);" % result
 
             return code
         elif cls.type_name == "nbool":
@@ -903,7 +905,7 @@ Py_INCREF(%(result)s);""" % {
     def getAssignConversionCode(cls, result, left, value):
         def _getObjectObject():
             code = "%s = %s;" % (result, value)
-            code += cls.getTakeReferenceStatement(result)
+            code += cls.getTakeReferenceStatement(result, immortal=False)
 
             return code
 
@@ -964,7 +966,7 @@ assert(%(type_name)s_CheckExact(%(operand)s));""" % {
         pass
 
     @staticmethod
-    def getTakeReferenceStatement(operand):
+    def getTakeReferenceStatement(operand, immortal):
         return ""
 
 
@@ -1598,7 +1600,7 @@ class CBoolDesc(ConcreteCTypeBase):
         return "CHECK_IF_TRUE(%s) == 1" % operand
 
     @staticmethod
-    def getTakeReferenceStatement(operand):
+    def getTakeReferenceStatement(operand, immortal):
         return ""
 
     @staticmethod
@@ -1644,7 +1646,7 @@ class NBoolDesc(ConcreteCTypeBase):
         return cls.getToValueFromBoolExpression("CHECK_IF_TRUE(%s)" % operand)
 
     @staticmethod
-    def getTakeReferenceStatement(operand):
+    def getTakeReferenceStatement(operand, immortal):
         return ""
 
     @staticmethod
@@ -1695,7 +1697,7 @@ class NVoidDesc(ConcreteCTypeBase):
         return "NUITKA_VOID_OK"
 
     @staticmethod
-    def getTakeReferenceStatement(operand):
+    def getTakeReferenceStatement(operand, immortal):
         return ""
 
     @staticmethod