Nuitka-winsvc 2.0.3__tar.gz → 2.0.6__tar.gz

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.0.3
+Version: 2.0.6
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/Nuitka_winsvc.egg-info/SOURCES.txt

@@ -1429,10 +1429,6 @@ tests/programs/case_imports3/path1/Some_Module.py
 tests/programs/case_imports3/path1/Some_Package/__init__.py
 tests/programs/case_imports3/path2/Some_Module.py
 tests/programs/case_imports3/path2/Some_Package/__init__.py
-tests/programs/chinese_names38/ChineseNamesMain.py
-tests/programs/chinese_names38/那里.py
-tests/programs/chinese_names38/测试/__init__.py
-tests/programs/chinese_names38/测试/这边.py
 tests/programs/cyclic_imports/CyclicImportsMain.py
 tests/programs/cyclic_imports/cyclic_importing_package/Child1.py
 tests/programs/cyclic_imports/cyclic_importing_package/Child2.py

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.0.3
+Version: 2.0.6
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/doc/nuitka-run.1

@@ -284,9 +284,9 @@ Compilation choices:
 \fB\-\-user\-package\-configuration\-file\fR=\fI\,YAML_FILENAME\/\fR
 User provided Yaml file with package configuration.
 You can include DLLs, remove bloat, add hidden
-dependencies. Check User Manual for a complete
-description of the format to use. Can be given
-multiple times. Defaults to empty.
+dependencies. Check the Nuitka Package Configuration
+Manual for a complete description of the format to
+use. Can be given multiple times. Defaults to empty.
 .TP
 \fB\-\-full\-compat\fR
 Enforce absolute compatibility with CPython. Do not
@@ -626,18 +626,19 @@ only). Defaults to off.
 .IP
 macOS specific controls:
 .TP
+\fB\-\-macos\-create\-app\-bundle\fR
+When compiling for macOS, create a bundle rather than
+a plain binary application. This is the only way to
+unlock the disabling of console, get high DPI
+graphics, etc. and implies standalone mode. Defaults
+to off.
+.TP
 \fB\-\-macos\-target\-arch\fR=\fI\,MACOS_TARGET_ARCH\/\fR
 What architectures is this to supposed to run on.
 Default and limit is what the running Python allows
 for. Default is "native" which is the architecture the
 Python is run with.
 .TP
-\fB\-\-macos\-create\-app\-bundle\fR
-When compiling for macOS, create a bundle rather than
-a plain binary application. Currently experimental and
-incomplete. Currently this is the only way to unlock
-disabling of console.Defaults to off.
-.TP
 \fB\-\-macos\-app\-icon\fR=\fI\,ICON_PATH\/\fR
 Add icon for the application bundle to use. Can be
 given only one time. Defaults to Python icon if

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/doc/nuitka.1

@@ -284,9 +284,9 @@ Compilation choices:
 \fB\-\-user\-package\-configuration\-file\fR=\fI\,YAML_FILENAME\/\fR
 User provided Yaml file with package configuration.
 You can include DLLs, remove bloat, add hidden
-dependencies. Check User Manual for a complete
-description of the format to use. Can be given
-multiple times. Defaults to empty.
+dependencies. Check the Nuitka Package Configuration
+Manual for a complete description of the format to
+use. Can be given multiple times. Defaults to empty.
 .TP
 \fB\-\-full\-compat\fR
 Enforce absolute compatibility with CPython. Do not
@@ -626,18 +626,19 @@ only). Defaults to off.
 .IP
 macOS specific controls:
 .TP
+\fB\-\-macos\-create\-app\-bundle\fR
+When compiling for macOS, create a bundle rather than
+a plain binary application. This is the only way to
+unlock the disabling of console, get high DPI
+graphics, etc. and implies standalone mode. Defaults
+to off.
+.TP
 \fB\-\-macos\-target\-arch\fR=\fI\,MACOS_TARGET_ARCH\/\fR
 What architectures is this to supposed to run on.
 Default and limit is what the running Python allows
 for. Default is "native" which is the architecture the
 Python is run with.
 .TP
-\fB\-\-macos\-create\-app\-bundle\fR
-When compiling for macOS, create a bundle rather than
-a plain binary application. Currently experimental and
-incomplete. Currently this is the only way to unlock
-disabling of console.Defaults to off.
-.TP
 \fB\-\-macos\-app\-icon\fR=\fI\,ICON_PATH\/\fR
 Add icon for the application bundle to use. Can be
 given only one time. Defaults to Python icon if

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/OptionParsing.py

@@ -614,9 +614,9 @@ compilation_group.add_option(
     metavar="YAML_FILENAME",
     help="""\
 User provided Yaml file with package configuration. You can include DLLs,
-remove bloat, add hidden dependencies. Check User Manual for a complete
-description of the format to use. Can be given multiple times. Defaults
-to empty.""",
+remove bloat, add hidden dependencies. Check the Nuitka Package Configuration
+Manual for a complete description of the format to use. Can be given
+multiple times. Defaults to empty.""",
 )
 
 compilation_group.add_option(
@@ -1461,6 +1461,18 @@ del windows_group
 
 macos_group = parser.add_option_group("macOS specific controls")
 
+macos_group.add_option(
+    "--macos-create-app-bundle",
+    action="store_true",
+    dest="macos_create_bundle",
+    default=False,
+    help="""\
+When compiling for macOS, create a bundle rather than a plain binary
+application. This is the only way to unlock the disabling of console,
+get high DPI graphics, etc. and implies standalone mode. Defaults to
+off.""",
+)
+
 macos_group.add_option(
     "--macos-target-arch",
     action="store",
@@ -1474,17 +1486,6 @@ is what the running Python allows for. Default is "native" which is
 the architecture the Python is run with.""",
 )
 
-macos_group.add_option(
-    "--macos-create-app-bundle",
-    action="store_true",
-    dest="macos_create_bundle",
-    default=False,
-    help="""\
-When compiling for macOS, create a bundle rather than a plain binary
-application. Currently experimental and incomplete. Currently this
-is the only way to unlock disabling of console.Defaults to off.""",
-)
-
 macos_group.add_option(
     "--macos-app-icon",
     action="append",
@@ -1993,7 +1994,14 @@ def _considerGithubWorkflowOptions(phase):
 
     import json
 
-    early_names = "main", "script-name", "enable-plugins", "disable-plugins"
+    early_names = (
+        "main",
+        "script-name",
+        "enable-plugin",
+        "enable-plugins",
+        "disable-plugin",
+        "disable-plugins",
+    )
 
     def filterByName(key):
         # Not for Nuitka at all.
@@ -2083,12 +2091,15 @@ def parseOptions(logger):
     filename_args = []
     module_mode = False
 
+    # Options may be coming from GitHub workflow configuration as well.
+    _considerGithubWorkflowOptions(phase="early")
+
     for count, arg in enumerate(sys.argv):
         if count == 0:
             continue
 
-        if arg.startswith("--main="):
-            filename_args.append(arg)
+        if arg.startswith(("--main=", "--script-name=")):
+            filename_args.append(arg.split("=", 1)[1])
 
         if arg == "--module":
             module_mode = True
@@ -2104,9 +2115,6 @@ def parseOptions(logger):
             + sys.argv[1:]
         )
 
-    # Options may be coming from GitHub workflow configuration as well.
-    _considerGithubWorkflowOptions(phase="early")
-
     # Next, lets activate plugins early, so they can inject more options to the parser.
     _considerPluginOptions(logger)
 

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/Tracing.py

@@ -433,7 +433,7 @@ plugins_logger = OurLogger("Nuitka-Plugins")
 recursion_logger = OurLogger("Nuitka-Inclusion")
 progress_logger = OurLogger("Nuitka-Progress", quiet=True)
 memory_logger = OurLogger("Nuitka-Memory")
-dependencies_logger = OurLogger("Nuitka-Dependencies")
+metadata_logger = OurLogger("Nuitka-Metadata")
 optimization_logger = FileLogger("Nuitka-Optimization")
 pgo_logger = FileLogger("Nuitka-PGO")
 code_generation_logger = OurLogger("Nuitka-CodeGen")

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.0.3
+Nuitka V2.0.6
 Copyright (C) 2023 Kay Hayen."""
 
 

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/build/SconsSpawn.py

@@ -174,6 +174,9 @@ def _getWindowsSpawnFunction(env, module_mode, source_files):
                 closeSconsProgressBar()
                 raise exception
 
+        if rv != 0:
+            closeSconsProgressBar()
+
         if cmd == "link":
             data = _filterMsvcLinkOutput(
                 env=env, module_mode=module_mode, data=data, exit_code=rv
@@ -398,9 +401,11 @@ def _getWrappedSpawnFunction(env):
 
         if exception:
             closeSconsProgressBar()
-
             raise exception
 
+        if result != 0:
+            closeSconsProgressBar()
+
         # Segmentation fault should give a clear error.
         if result == -11:
             scons_logger.sysexit(

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/nodes/ImportNodes.py

@@ -563,6 +563,8 @@ class ExpressionImportModuleHard(
                         )
 
                         if finding != "not-found":
+                            trace_collection.onExceptionRaiseExit(ImportError)
+
                             result = makeExpressionImportModuleFixed(
                                 using_module_name=self.getParentModule().getFullName(),
                                 module_name=full_name,
@@ -573,7 +575,7 @@ class ExpressionImportModuleHard(
                             return (
                                 result,
                                 "new_expression",
-                                "Attribute lookup '%s* of hard module *%s* becomes hard module name import."
+                                "Attribute lookup '%s' of hard module '%s' becomes hard module name import."
                                 % (self.value_name, attribute_name),
                             )
 
@@ -844,31 +846,40 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
 
         self.finding = None
 
-    def _attemptFollow(self, module_name):
-        # Complex stuff, pylint: disable=too-many-branches,too-many-locals
-
+    def _getLevelValue(self):
         parent_module = self.getParentModule()
-
         level = self.subnode_level
 
         if level is None:
-            level = 0 if parent_module.getFutureSpec().isAbsoluteImport() else -1
+            return 0 if parent_module.getFutureSpec().isAbsoluteImport() else -1
         elif not level.isCompileTimeConstant():
-            return
+            return None
         else:
-            level = level.getCompileTimeConstant()
+            level_value = level.getCompileTimeConstant()
+
+            # TODO: Catch this as a static error maybe.
+            if type(level_value) not in (int, long):
+                return None
+
+            return level_value
+
+    def _attemptFollow(self, module_name):
+        # Complex stuff, pylint: disable=too-many-branches,too-many-locals
+
+        # Without the level value, we don't know what it is.
+        level_value = self._getLevelValue()
+        if level_value is None:
+            return
 
-        if level != 0:
+        parent_module = self.getParentModule()
+
+        if level_value != 0:
             parent_package = parent_module.getFullName()
             if not parent_module.isCompiledPythonPackage():
                 parent_package = parent_package.getPackageName()
         else:
             parent_package = None
 
-        # TODO: Catch this as a static error maybe.
-        if type(level) not in (int, long):
-            return None
-
         module_name_resolved = resolveModuleName(module_name)
         if module_name_resolved != module_name:
             module_name = module_name_resolved
@@ -885,7 +896,7 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
         module_name_found, module_filename, module_kind, self.finding = locateModule(
             module_name=ModuleName(module_name),
             parent_package=parent_package,
-            level=level,
+            level=level_value,
         )
 
         self.used_modules = [
@@ -894,7 +905,7 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
                 filename=module_filename,
                 module_kind=module_kind,
                 finding=self.finding,
-                level=level,
+                level=level_value,
                 source_ref=self.source_ref,
                 reason="import",
             )
@@ -960,7 +971,7 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
                 ) = locateModule(
                     module_name=module_name,
                     parent_package=parent_package,
-                    level=level,
+                    level=level_value,
                 )
 
                 self.used_modules.append(
@@ -969,7 +980,7 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
                         filename=module_filename,
                         module_kind=module_kind,
                         finding=finding,
-                        level=level,
+                        level=level_value,
                         source_ref=self.source_ref,
                         reason="import",
                     )
@@ -1026,6 +1037,55 @@ class ExpressionBuiltinImport(ChildrenExpressionBuiltinImportMixin, ExpressionBa
                 trace_collection.onModuleUsageAttempt(module_usage_attempt)
 
             if type(imported_module_name) in (str, unicode):
+                if self.finding == "relative":
+                    parent_module = self.getParentModule()
+
+                    parent_package = parent_module.getFullName()
+                    if not parent_module.isCompiledPythonPackage():
+                        parent_package = parent_package.getPackageName()
+
+                    level_value = abs(self._getLevelValue())
+                    level_value -= 1
+
+                    while level_value > 0:
+                        parent_package = parent_package.getPackageName()
+                        level_value -= 1
+
+                    if imported_module_name != "":
+                        candidate_module_name = parent_package.getChildNamed(
+                            imported_module_name
+                        )
+                    else:
+                        candidate_module_name = parent_package
+
+                    if (
+                        candidate_module_name in hard_modules_non_stdlib
+                        or module_filename is None
+                        or isStandardLibraryPath(module_filename)
+                    ):
+                        result = ExpressionImportModuleHard(
+                            using_module_name=self.getParentModule().getFullName(),
+                            module_name=candidate_module_name,
+                            value_name=self._getImportedValueName(
+                                candidate_module_name
+                            ),
+                            source_ref=self.source_ref,
+                        )
+
+                        return (
+                            result,
+                            "new_expression",
+                            "Lowered import %s module '%s' to hard import."
+                            % (
+                                (
+                                    "hard import"
+                                    if candidate_module_name in hard_modules_non_stdlib
+                                    else "standard library"
+                                ),
+                                candidate_module_name.asString(),
+                            ),
+                        )
+
                 imported_module_name = resolveModuleName(imported_module_name)
 
                 if self.finding == "absolute" and isHardModule(imported_module_name):

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/nodes/ModuleNodes.py

@@ -954,7 +954,7 @@ class PythonMainModule(CompiledPythonModule):
             )
 
             # Technically required, but not found must not happen
-            assert finding != "not-found"
+            assert finding != "not-found", early_module_name
 
             self.standard_library_modules.add(
                 makeModuleUsageAttempt(

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/plugins/PluginBase.py

@@ -69,6 +69,7 @@ from nuitka.PythonVersions import (
     python_version,
 )
 from nuitka.Tracing import plugins_logger
+from nuitka.utils.AppDirs import getAppdirsModule
 from nuitka.utils.Distributions import (
     getDistributionFromModuleName,
     getDistributionName,
@@ -79,7 +80,7 @@ from nuitka.utils.FileOperations import (
     changeFilenameExtension,
     getFileContents,
 )
-from nuitka.utils.Importing import isBuiltinModuleName
+from nuitka.utils.Importing import getSharedLibrarySuffix, isBuiltinModuleName
 from nuitka.utils.ModuleNames import (
     ModuleName,
     makeTriggerModuleName,
@@ -147,6 +148,7 @@ def _getEvaluationContext():
             # Frequent used modules
             "sys": sys,
             "os": os,
+            "appdirs": getAppdirsModule(),
             # Builtins
             "True": True,
             "False": False,
@@ -179,6 +181,9 @@ def _getEvaluationContext():
         _context_dict["before_python3"] = python_version < 0x300
         _context_dict["python3_or_higher"] = python_version >= 0x300
 
+        _context_dict["extension_std_suffix"] = getSharedLibrarySuffix(preferred=True)
+        _context_dict["extension_suffix"] = getSharedLibrarySuffix(preferred=False)
+
     return _context_dict
 
 

{Nuitka-winsvc-2.0.3 → Nuitka-winsvc-2.0.6}/nuitka/plugins/standard/AntiBloatPlugin.py

@@ -37,7 +37,7 @@ _mode_choices = ("error", "warning", "nofollow", "allow")
 
 
 class NuitkaPluginAntiBloat(NuitkaYamlPluginBase):
-    # Lots of details, a bunch of state is cached
+    # Lots of details, a bunch of state is cached, pylint: disable=too-many-instance-attributes
 
     plugin_name = "anti-bloat"
     plugin_desc = (
@@ -210,6 +210,9 @@ form 'module_name:[%s]'."""
         # information given for that.
         self.no_auto_follows = {}
 
+        # Keep track of modules prevented from being followed at all.
+        self.no_follows = OrderedDict()
+
         # Cache execution context for anti-bloat configs.
         self.context_codes = {}
 
@@ -559,7 +562,22 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
         source_ref,
         reason,
     ):
-        # Quite a few special cases, but not really complex. pylint: disable=too-many-branches
+        # Quite a few special cases, but not really complex.
+        # pylint: disable=too-many-branches,too-many-locals
+
+        # First off, activate "no-follow" configurations.
+        for (
+            config_of_module_name,
+            no_follow,
+            description,
+        ) in self.getYamlConfigItemItems(
+            module_name=module_name,
+            section="anti-bloat",
+            item_name="no-follow",
+            decide_relevant=lambda key, value: True,
+            recursive=True,
+        ):
+            self.no_follows[no_follow] = (config_of_module_name, description)
 
         # Do not even look at these. It's either included by a module that is in standard
         # library, or included for a module in standard library.
@@ -660,7 +678,7 @@ slow down compilation."""
         if using_module_name is not None:
 
             def decideRelevant(key, value):
-                # Only checking key, pylint: disable=unused-argument
+                # Only checking keys of configs, pylint: disable=unused-argument
 
                 return module_name.hasNamespace(key)
 
@@ -685,6 +703,17 @@ slow down compilation."""
                     % (config_of_module_name, no_auto_follow),
                 )
 
+        for no_follow_pattern, (
+            config_of_module_name,
+            description,
+        ) in self.no_follows.items():
+            if module_name.matchesToShellPattern(no_follow_pattern)[0]:
+                return (
+                    False,
+                    "according to yaml 'no-follow' configuration of '%s' for '%s'"
+                    % (config_of_module_name, no_follow_pattern),
+                )
+
         # Do not provide an opinion about it.
         return None