Merge branch 'hotfix/0.5.28.1'

debian/changelog

@@ -1,3 +1,9 @@
+nuitka (0.5.28.1+ds-1) unstable; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <[email protected]>  Sun, 22 Oct 2017 10:44:31 +0200
+
 nuitka (0.5.28+ds-1) unstable; urgency=medium
 
   * New upstream release.

nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V0.5.28
+Nuitka V0.5.28.1
 Copyright (C) 2017 Kay Hayen."""
 
 def getNuitkaVersion():

nuitka/build/SingleExe.scons

@@ -1055,6 +1055,9 @@ def makeWindowsMingGW64Lib(win_lib_path):
     if rv != 0:
         sys.exit('Error, unexpected error from "gendef.exe" %s.' % stderr)
 
+    if str is not bytes:
+        defs = defs.decode("utf8")
+
     defs_filename = os.path.join(
         new_win_lib_path,
         "python%s.defs" % python_abi_version.replace('.', "")

nuitka/build/inline_copy/lib/scons-3.0.0/SCons/Tool/MSCommon/vc.py

@@ -474,7 +474,7 @@ def msvc_find_valid_batch_script(env,version):
                 (host_target, version)
             SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
         arg = _HOST_TARGET_ARCH_TO_BAT_ARCH[host_target]
-        
+
         # Get just version numbers
         maj, min = msvc_version_to_maj_min(version)
         # VS2015+
@@ -559,7 +559,9 @@ def msvc_setup_env(env):
         debug('MSVC_USE_SCRIPT set to False')
         warn_msg = "MSVC_USE_SCRIPT set to False, assuming environment " \
                    "set correctly."
-        SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
+
+        # Nuitka: We use this on purpose.
+        # SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
         return None
 
     for k, v in d.items():

nuitka/build/static_src/MetaPathBasedLoader.c

@@ -469,11 +469,14 @@ PyObject *callIntoShlibModule( const char *full_name, const char *filename )
 
     if (unlikely( module == NULL ))
     {
-        PyErr_Format(
-            PyExc_SystemError,
-            "dynamic module '%s' not initialized properly",
-            full_name
-        );
+        if ( !ERROR_OCCURRED() )
+        {
+            PyErr_Format(
+                PyExc_SystemError,
+                "dynamic module '%s' not initialized properly",
+                full_name
+            );
+        }
 
         return NULL;
     }

nuitka/freezer/Standalone.py

@@ -154,7 +154,7 @@ def _detectedSourceFile(filename, module_name, result, user_provided, technical)
         source_code = source_code
     )
 
-    bytecode = compile(source_code, filename, "exec")
+    bytecode = compile(source_code, filename, "exec", dont_inherit = True)
 
     bytecode = Plugins.onFrozenModuleBytecode(
         module_name = module_name,

nuitka/importing/Recursion.py

@@ -123,7 +123,8 @@ def _recurseTo(module_package, module_filename, module_relpath, module_kind,
                                 compile(
                                     source_code,
                                     module_filename,
-                                    "exec"
+                                    "exec",
+                                    dont_inherit = True
                                 )
                             ),
                             is_package    = module.isCompiledPythonPackage(),

nuitka/optimizations/BytecodeDemotion.py

@@ -52,7 +52,7 @@ def demoteCompiledModuleToBytecode(module):
         source_code = source_code
     )
 
-    bytecode = compile(source_code, filename, "exec")
+    bytecode = compile(source_code, filename, "exec", dont_inherit = True)
 
     bytecode = Plugins.onFrozenModuleBytecode(
         module_name = full_name,

nuitka/tools/release/pypi/__main__.py

@@ -55,8 +55,10 @@ def main():
 
     print("Creating documentation.")
     createReleaseDocumentation()
-    print("Creating source distribution and uploading it.")
-    assert os.system("python setup.py sdist upload") == 0
+    print("Creating source distribution.")
+    assert os.system("python setup.py sdist") == 0
+    print("Uploading source dist")
+    assert os.system("twine upload dist/*")
     print("Uploaded.")
 
     # TODO: This won't work yet.