Merge branch 'hotfix/0.6.10.1'

Author: kayhayen

debian/changelog

@@ -1,3 +1,9 @@
+nuitka (0.6.10.1+ds-1) unstable; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <kay.hayen@gmail.com>  Sun, 13 Dec 2020 19:47:53 +0100
+
 nuitka (0.6.10+ds-1) unstable; urgency=medium
 
   * New upstream release.

debian/rules

@@ -11,7 +11,7 @@ export PYBUILD_INTERPRETERS = python{version}
 # to cover, Debian 11 inheritance.
 DEB_VENDOR=$(shell dpkg-vendor --query vendor)
 ifeq ($(DEB_VENDOR), Debian)
-BUILD_ONLY_PYTHON3 := $(shell [ `lsb_release -r -s | sed -e s/unstable/11/ -e s/testing/11/` -ge 11 ] && echo true)
+BUILD_ONLY_PYTHON3 := $(shell [ `lsb_release -r -s | sed -e s/unstable/11/ -e s/testing/11/ -e 's/\..*//'` -ge 11 ] && echo true)
 else ifeq ($(DEB_VENDOR), Ubuntu)
 BUILD_ONLY_PYTHON3 := $(shell [ `lsb_release -r -s | sed -e 's/\.//' ` -ge 2004 ] && echo true)
 else

nuitka/MainControl.py

@@ -142,6 +142,9 @@ def createNodeTree(filename):
             plugin_filename=module_filename, module_package=module_package
         )
 
+    # Allow plugins to add more modules based on the initial set being complete.
+    Plugins.onModuleInitialSet()
+
     # Then optimize the tree and potentially recursed modules.
     Optimization.optimize(main_module.getOutputFilename())
 

nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V0.6.10
+Nuitka V0.6.10.1
 Copyright (C) 2020 Kay Hayen."""
 
 

nuitka/build/SconsCaching.py

@@ -25,9 +25,15 @@
 from collections import defaultdict
 
 from nuitka.Tracing import scons_logger
+from nuitka.utils.AppDirs import getCacheDir
 from nuitka.utils.Download import getCachedDownload
 from nuitka.utils.Execution import getPythonInstallPathWindows
-from nuitka.utils.FileOperations import getLinkTarget, withFileLock
+from nuitka.utils.FileOperations import (
+    getExternalUsePath,
+    getLinkTarget,
+    makePath,
+    withFileLock,
+)
 from nuitka.utils.Utils import getOS, isWin32Windows
 
 from .SconsUtils import (
@@ -172,6 +178,14 @@ def enableCcache(
     setEnvironmentVariable(env, "CCACHE_LOGFILE", ccache_logfile)
     env["CCACHE_LOGFILE"] = ccache_logfile
 
+    # Unless asked to do otherwise, store ccache files in our own directory.
+    if "CCACHE_DIR" not in os.environ:
+        ccache_dir = os.path.join(getCacheDir(), "ccache")
+        makePath(ccache_dir)
+        ccache_dir = getExternalUsePath(ccache_dir)
+        setEnvironmentVariable(env, "CCACHE_DIR", ccache_dir)
+        env["CCACHE_DIR"] = ccache_dir
+
     # First check if it's not already supposed to be a ccache, then do nothing.
     cc_path = getExecutablePath(the_compiler, env=env)
 

nuitka/build/static_src/HelpersRaising.c

@@ -34,6 +34,7 @@ static void FORMAT_TYPE_ERROR1(PyObject **exception_type, PyObject **exception_v
     CHECK_OBJECT(*exception_value);
 }
 
+#if PYTHON_VERSION >= 270
 static void FORMAT_TYPE_ERROR2(PyObject **exception_type, PyObject **exception_value, char const *format,
                                char const *arg1, char const *arg2) {
     *exception_type = PyExc_TypeError;
@@ -42,6 +43,7 @@ static void FORMAT_TYPE_ERROR2(PyObject **exception_type, PyObject **exception_v
     *exception_value = Nuitka_String_FromFormat(format, arg1, arg2);
     CHECK_OBJECT(*exception_value);
 }
+#endif
 
 #if PYTHON_VERSION < 266
 #define WRONG_EXCEPTION_TYPE_ERROR_MESSAGE "exceptions must be classes or instances, not %s"

nuitka/nodes/ModuleNodes.py

@@ -444,7 +444,7 @@ def getUsedModules(self):
         return self.used_modules
 
     def addUsedFunction(self, function_body):
-        assert function_body in self.getFunctions()
+        assert function_body in self.getFunctions(), function_body
 
         assert (
             function_body.isExpressionFunctionBody()
@@ -815,7 +815,7 @@ def getPyIFilename(self):
     def _readPyPIFile(self):
         """ Read the .pyi file if present and scan for dependencies. """
 
-        # Complex stuff, pylint: disable=too-many-branches
+        # Complex stuff, pylint: disable=too-many-branches,too-many-statements
 
         if self.used_modules is None:
             pyi_filename = self.getPyIFilename()
@@ -840,18 +840,26 @@ def _readPyPIFile(self):
                             assert parts[0] == "from"
                             assert parts[2] == "import"
 
-                            if parts[1] == "typing":
+                            origin_name = parts[1]
+
+                            if origin_name == "typing":
                                 continue
 
-                            pyi_deps.add(parts[1])
+                            if origin_name == ".":
+                                origin_name = self.getFullName()
+
+                            # TODO: Might want to add full relative import handling.
+
+                            if origin_name != self.getFullName():
+                                pyi_deps.add(origin_name)
 
                             imported = parts[3]
                             if imported.startswith("("):
                                 # Handle multiline imports
                                 if not imported.endswith(")"):
                                     in_import = True
                                     imported = imported[1:]
-                                    in_import_part = parts[1]
+                                    in_import_part = origin_name
                                     assert in_import_part, (
                                         "Multiline part in file %s cannot be empty"
                                         % pyi_filename
@@ -867,7 +875,7 @@ def _readPyPIFile(self):
                             for name in imported.split(","):
                                 if name:
                                     name = name.strip()
-                                    pyi_deps.add(parts[1] + "." + name)
+                                    pyi_deps.add(origin_name + "." + name)
 
                     else:  # In import
                         imported = line
@@ -890,6 +898,8 @@ def _readPyPIFile(self):
     def getUsedModules(self):
         self._readPyPIFile()
 
+        assert "." not in self.used_modules, self
+
         return self.used_modules
 
     def getParentModule(self):

nuitka/optimizations/TraceCollections.py

@@ -27,6 +27,7 @@
 
 from nuitka import Tracing, Variables
 from nuitka.__past__ import iterItems  # Python3 compatibility.
+from nuitka.containers.oset import OrderedSet
 from nuitka.importing.ImportCache import getImportedModuleByNameAndPath
 from nuitka.ModuleRegistry import addUsedModule
 from nuitka.nodes.NodeMakingHelpers import getComputationResult
@@ -601,7 +602,7 @@ def mergeMultipleBranches(self, collections):
         for collection in collections:
             for variable, version in iterItems(collection.variable_actives):
                 if variable not in variable_versions:
-                    variable_versions[variable] = set([version])
+                    variable_versions[variable] = OrderedSet((version,))
                 else:
                     variable_versions[variable].add(version)
 

nuitka/plugins/PluginBase.py

@@ -162,7 +162,16 @@ def considerImplicitImports(self, module, signal_change):
 
             full_name = ModuleName(full_name)
 
-            module_filename = self.locateModule(importing=module, module_name=full_name)
+            try:
+                module_filename = self.locateModule(
+                    importing=module, module_name=full_name
+                )
+            except Exception:
+                self.warning(
+                    "Problem locating '%s' implicit imports '%s'."
+                    % (module.getFullName(), full_name)
+                )
+                raise
 
             if module_filename is None:
                 if Options.isShowInclusion():
@@ -429,6 +438,17 @@ def onModuleEncounter(self, module_filename, module_name, module_kind):
         # Virtual method, pylint: disable=no-self-use,unused-argument
         return None
 
+    def onModuleInitialSet(self):
+        """Provide extra modules to the initial root module set.
+
+        Args:
+            None
+        Returns:
+            Iterable of modules, may yield.
+        """
+        # Virtual method, pylint: disable=no-self-use
+        return ()
+
     @staticmethod
     def locateModule(importing, module_name):
         """Provide a filename / -path for a to-be-imported module.

nuitka/plugins/Plugins.py

@@ -334,6 +334,14 @@ def onModuleEncounter(module_filename, module_name, module_kind):
 
         return result
 
+    @staticmethod
+    def onModuleInitialSet():
+        from nuitka.ModuleRegistry import addRootModule
+
+        for plugin in getActivePlugins():
+            for module in plugin.onModuleInitialSet():
+                addRootModule(module)
+
     @staticmethod
     def considerFailedImportReferrals(module_name):
         for plugin in getActivePlugins():

nuitka/plugins/standard/MultiprocessingPlugin.py

@@ -44,10 +44,7 @@ class NuitkaPluginMultiprocessingWorkarounds(NuitkaPluginBase):
     """
 
     plugin_name = "multiprocessing"
-    plugin_desc = "Required by Python's multiprocessing module"
-
-    def __init__(self):
-        self.multiprocessing_added = False
+    plugin_desc = "Required by Python's multiprocessing module on Windows"
 
     @classmethod
     def isRelevant(cls):
@@ -112,9 +109,9 @@ def _reduce_compiled_method(m):
 
         return None, None
 
-    @staticmethod
-    def _addSlaveMainModule(root_module):
-        from nuitka.ModuleRegistry import addRootModule
+    def onModuleInitialSet(self):
+        from nuitka.importing.ImportCache import addImportedModule
+        from nuitka.ModuleRegistry import getRootTopModule
         from nuitka.plugins.Plugins import Plugins
         from nuitka.tree.Building import (
             CompiledPythonModule,
@@ -124,6 +121,8 @@ def _addSlaveMainModule(root_module):
 
         # First, build the module node and then read again from the
         # source code.
+        root_module = getRootTopModule()
+
         module_name = ModuleName("__parents_main__")
         source_ref = root_module.getSourceReference()
 
@@ -159,22 +158,13 @@ def _addSlaveMainModule(root_module):
             is_main=False,
         )
 
-        # This is an alternative entry point of course.
-        addRootModule(slave_main_module)
+        addImportedModule(imported_module=slave_main_module)
 
-    def onModuleEncounter(self, module_filename, module_name, module_kind):
-        if module_name == "multiprocessing" and not self.multiprocessing_added:
-            self.multiprocessing_added = True
-
-            from nuitka.ModuleRegistry import getRootModules
-
-            for root_module in getRootModules():
-                if root_module.isMainModule():
-                    self._addSlaveMainModule(root_module)
-                    break
-            else:
-                assert False
+        yield slave_main_module
 
+    def onModuleEncounter(self, module_filename, module_name, module_kind):
+        # Enforce recursion in to multiprocessing for accelerated mode, which
+        # would normally avoid this.
         if module_name.hasNamespace("multiprocessing"):
             return True, "Multiprocessing plugin needs this to monkey patch it."
 

nuitka/utils/FileOperations.py

@@ -153,7 +153,8 @@ def _getRealPathWindows(path):
     import subprocess
 
     result = subprocess.check_output(
-        """powershell "Get-Item '%s' | Select-Object -ExpandProperty Target" """ % path
+        """powershell -NoProfile "Get-Item '%s' | Select-Object -ExpandProperty Target" """
+        % path
     )
 
     return os.path.join(os.path.dirname(path), result.rstrip("\r\n"))
@@ -497,7 +498,12 @@ def getWindowsShortPathName(filename):
             )
 
         if output_buf_size >= needed:
-            return output_buf.value
+            # Short paths should be ASCII. Don't return unicode without a need,
+            # as e.g. Scons hates that in environment variables.
+            if str is bytes:
+                return output_buf.value.encode("utf8")
+            else:
+                return output_buf.value
         else:
             output_buf_size = needed
 
@@ -510,7 +516,7 @@ def getExternalUsePath(filename, only_dirname=False):
     Returns:
         Path that is a absolute and (on Windows) short filename pointing at the same file.
     Notes:
-        Except on Windows, this is merely os.path.abspath, there is coverts
+        This is only os.path.abspath except on Windows, where is coverts
         to a short path too.
     """
 

setup.py

@@ -227,7 +227,10 @@ def get_script_args(dist, executable=os.path.normpath(sys.executable), wininst=F
     easy_install.get_script_args = get_script_args
 
 
-binary_suffix = "" if sys.version_info[0] == 2 else sys.version_info[0]
+if sys.version_info[0] == 2:
+    binary_suffix = ""
+else:
+    binary_suffix = "%d" % sys.version_info[0]
 
 setup(
     name=project_name,