Merge branch 'hotfix/0.6.15.2'

debian/changelog

@@ -1,3 +1,9 @@
+nuitka (0.6.15.2+ds-1) experimental; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <kay.hayen@gmail.com>  Thu, 03 Jun 2021 11:41:07 +0200
+
 nuitka (0.6.15.1+ds-1) experimental; urgency=medium
 
   * New upstream hotfix release.

nuitka/Tracing.py

@@ -199,6 +199,10 @@ def warning(self, message, style="red"):
             self.my_print(message, style=style, file=sys.stderr)
 
     def sysexit(self, message, exit_code=1):
+        from nuitka.Progress import closeProgressBar
+
+        closeProgressBar()
+
         self.my_print("FATAL: %s" % message, style="red", file=sys.stderr)
 
         sys.exit(exit_code)
@@ -230,10 +234,11 @@ def __init__(self, name, quiet=False, base_style=None, file_handle=None):
     def my_print(self, message, **kwargs):
         message = message + "\n"
 
-        file_handle = self.file_handle or sys.stdout
+        if "file" not in kwargs:
+            kwargs["file"] = self.file_handle or sys.stdout
 
-        file_handle.write(message)
-        file_handle.flush()
+        my_print(message, **kwargs)
+        kwargs["file"].flush()
 
     def setFileHandle(self, file_handle):
         self.file_handle = file_handle

nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V0.6.15.1
+Nuitka V0.6.15.2
 Copyright (C) 2021 Kay Hayen."""
 
 

nuitka/build/static_src/HelpersDeepcopy.c

@@ -25,6 +25,14 @@
 #include "nuitka/prelude.h"
 #endif
 
+#if PYTHON_VERSION >= 0x390
+typedef struct {
+    PyObject_HEAD PyObject *origin;
+    PyObject *args;
+    PyObject *parameters;
+} GenericAliasObject;
+#endif
+
 PyObject *DEEP_COPY(PyObject *value) {
     if (PyDict_Check(value)) {
 #if PYTHON_VERSION < 0x330
@@ -152,6 +160,20 @@ PyObject *DEEP_COPY(PyObject *value) {
     } else if (PyByteArray_Check(value)) {
         // TODO: Could make an exception for zero size.
         return PyByteArray_FromObject(value);
+#if PYTHON_VERSION >= 0x390
+    } else if (Py_TYPE(value) == &Py_GenericAliasType) {
+        GenericAliasObject *generic_alias = (GenericAliasObject *)value;
+
+        PyObject *args = DEEP_COPY(generic_alias->args);
+        PyObject *origin = DEEP_COPY(generic_alias->origin);
+
+        if (generic_alias->args == args && generic_alias->origin == origin) {
+            Py_INCREF(value);
+            return value;
+        } else {
+            return Py_GenericAlias(origin, args);
+        }
+#endif
     } else {
         PyErr_Format(PyExc_TypeError, "DEEP_COPY does not implement: %s", value->ob_type->tp_name);
 

nuitka/freezer/Standalone.py

@@ -56,6 +56,7 @@
 from nuitka.utils.Execution import getNullInput, withEnvironmentPathAdded
 from nuitka.utils.FileOperations import (
     areSamePaths,
+    copyFileWithPermissions,
     copyTree,
     getDirectoryRealPath,
     getFileContentByLine,
@@ -1372,7 +1373,7 @@ def _handleDataFile(dist_dir, tracer, included_datafile):
                 ) as output:
                     output.write(content)
         else:
-            shutil.copy2(source_desc, target_filename)
+            copyFileWithPermissions(source_desc, target_filename)
 
 
 def copyDataFiles(dist_dir):

nuitka/optimizations/Optimization.py

@@ -26,6 +26,7 @@
 import inspect
 
 from nuitka import ModuleRegistry, Options, Variables
+from nuitka.Errors import NuitkaForbiddenImportEncounter
 from nuitka.importing import ImportCache
 from nuitka.plugins.Plugins import Plugins
 from nuitka.Progress import (
@@ -115,6 +116,8 @@ def optimizeCompiledPythonModule(module):
             # print("Compute module")
             with withChangeIndicationsTo(signalChange):
                 scopes_were_incomplete = module.computeModule()
+        except NuitkaForbiddenImportEncounter as e:
+            optimization_logger.sysexit("Error, forbidden import '%s' encountered." % e)
         except BaseException:
             general.info("Interrupted while working on '%s'." % module)
             raise

nuitka/plugins/standard/AntiBloat.py

@@ -42,8 +42,20 @@ def __init__(self, setuptools_mode, custom_choices):
             self.handled_modules["setuptools"] = setuptools_mode
 
         for custom_choice in custom_choices:
+            if ":" not in custom_choice:
+                self.sysexit(
+                    "Error, malformed value  '%s' for '--noinclude-custom-mode' used."
+                    % custom_choice
+                )
+
             module_name, mode = custom_choice.rsplit(":", 1)
 
+            if mode not in ("error", "warning", "nofollow", "allow"):
+                self.sysexit(
+                    "Error, illegal mode given '%s' in '--noinclude-custom-mode=%s'"
+                    % (mode, custom_choice)
+                )
+
             self.handled_modules[ModuleName(module_name)] = mode
 
     @classmethod
@@ -67,15 +79,18 @@ def addPluginCommandLineOptions(cls, group):
             help="""\
 What to do if a specific import is encountered. Format is module name,
 which can and should be a top level package and then one choice, "error",
-"warning", "nofollow".""",
+"warning", "nofollow", e.g. PyQt5:error.""",
         )
 
     def onModuleEncounter(self, module_filename, module_name, module_kind):
         for handled_module_name, mode in self.handled_modules.items():
             if module_name.hasNamespace(handled_module_name):
+                # Make sure the compilation abrts.
                 if mode == "error":
                     raise NuitkaForbiddenImportEncounter(module_name)
 
+                # Either issue a warning, or pretend the module doesn't exist for standalone or
+                # at least will not be included.
                 if mode == "warning":
                     self.warning("Forbidden import of '%s' encountered." % module_name)
                 elif mode == "nofollow":

nuitka/plugins/standard/PkgResourcesPlugin.py

@@ -35,7 +35,7 @@ class NuitkaPluginResources(NuitkaPluginBase):
     def __init__(self):
         try:
             import pkg_resources
-        except ImportError:
+        except (ImportError, RuntimeError):
             self.pkg_resources = None
         else:
             self.pkg_resources = pkg_resources
@@ -49,6 +49,7 @@ def __init__(self):
 
         try:
             from importlib import metadata
+
             self.metadata = metadata
         except ImportError:
             pass

nuitka/utils/FileOperations.py

@@ -24,6 +24,7 @@
 
 from __future__ import print_function
 
+import errno
 import glob
 import os
 import shutil
@@ -517,6 +518,24 @@ def copyTree(source_path, dest_path):
     return copy_tree(source_path, dest_path)
 
 
+def copyFileWithPermissions(source_path, dest_path):
+    """Improved version of shutil.copy2.
+
+    File systems might not allow to transfer extended attributes, which we then ignore
+    and only copy permissions.
+    """
+
+    try:
+        shutil.copy2(source_path, dest_path)
+    except PermissionError as e:
+        if e.errno != errno.EACCES:
+            raise
+
+        source_mode = os.stat(source_path).st_mode
+        shutil.copy(source_path, dest_path)
+        os.chmod(dest_path, source_mode)
+
+
 def getWindowsDrive(path):
     """Windows drive for a given path."""