Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.4.8__cp311-cp311-win_amd64.whl

nuitka/code_generation/LineNumberCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Generate code that updates the source code line.
 
 """
@@ -89,3 +75,19 @@ def getLineNumberCode(to_name, emit, context):
     assert context.getFrameHandle() is not None
 
     emit("%s = %s->m_frame.f_lineno;" % (to_name, context.getFrameHandle()))
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/ListCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code generation for lists.
 
 Right now only the creation is done here. But more should be added later on.
@@ -68,7 +54,7 @@ def generateListCreationCode(to_name, expression, emit, context):
 
         helper_code = generateElementCode(elements[0])
 
-        emit("%s = MAKE_LIST_EMPTY(%d);" % (result_name, len(elements)))
+        emit("%s = MAKE_LIST_EMPTY(tstate, %d);" % (result_name, len(elements)))
 
         needs_exception_exit = any(
             element.mayRaiseException(BaseException) for element in elements[1:]
@@ -201,7 +187,7 @@ def generateListOperationCopyCode(to_name, expression, emit, context):
     with withObjectCodeTemporaryAssignment(
         to_name, "list_copy_result", expression, emit, context
     ) as result_name:
-        emit("%s = LIST_COPY(%s);" % (result_name, list_arg_name))
+        emit("%s = LIST_COPY(tstate, %s);" % (result_name, list_arg_name))
 
         getErrorExitCode(
             check_name=result_name,
@@ -428,25 +414,19 @@ def generateListOperationRemoveCode(to_name, expression, emit, context):
         expression=expression, emit=emit, context=context
     )
 
-    with withObjectCodeTemporaryAssignment(
-        to_name, "list_remove_result", expression, emit, context
-    ) as result_name:
-        # TODO: Have a dedicated list helper instead, this could be more efficient,
-        # this call is also very bad.
-        emit("assert(PyList_CheckExact(%s));" % list_arg_name)
-        emit(
-            '%s = PyObject_CallMethod(%s, (char *)"remove", "O", %s);'
-            % (result_name, list_arg_name, value_arg_name)
-        )
+    res_name = context.getBoolResName()
 
-        getErrorExitCode(
-            check_name=result_name,
-            release_names=(list_arg_name, value_arg_name),
-            emit=emit,
-            context=context,
-        )
+    emit("%s = LIST_REMOVE(%s, %s);" % (res_name, list_arg_name, value_arg_name))
 
-        context.addCleanupTempName(result_name)
+    getErrorExitBoolCode(
+        condition="%s == false" % res_name,
+        release_names=(list_arg_name, value_arg_name),
+        needs_check=expression.mayRaiseExceptionOperation(),
+        emit=emit,
+        context=context,
+    )
+
+    assignConstantNoneResult(to_name, emit, context)
 
 
 def generateListOperationSort1Code(to_name, expression, emit, context):
@@ -504,3 +484,19 @@ def generateBuiltinListCode(to_name, expression, emit, context):
         emit=emit,
         context=context,
     )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/LoaderCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code to generate and interact with module loaders.
 
 This is for generating the look-up table for the modules included in a binary
@@ -99,6 +85,9 @@ def getModuleMetaPathLoaderEntryCode(module, bytecode_accessor):
     elif module.isPythonExtensionModule():
         flags.append("NUITKA_EXTENSION_MODULE_FLAG")
 
+        if module.isExtensionModulePackage():
+            flags.append("NUITKA_PACKAGE_FLAG")
+
         return template_metapath_loader_extension_module_entry % {
             "module_name": module_c_name,
             "flags": " | ".join(flags),
@@ -186,3 +175,19 @@ PyThreadState *tstate, PyObject *, struct Nuitka_MetaPathBasedLoaderEntry const
         "bytecode_count": bytecode_accessor.getConstantsCount(),
         "frozen_modules": indented(frozen_defs),
     }
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/LocalsDictCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code generation for locals dict handling.
 
 These are variable handling for classes and partially also Python2 exec
@@ -36,7 +22,8 @@ from .PythonAPICodes import getReferenceExportCode
 from .templates.CodeTemplatesVariables import (
     template_read_locals_dict_with_fallback,
     template_read_locals_dict_without_fallback,
-    template_read_locals_mapping_with_fallback,
+    template_read_locals_mapping_with_fallback_no_ref,
+    template_read_locals_mapping_with_fallback_ref,
     template_read_locals_mapping_without_fallback,
 )
 
@@ -48,7 +35,7 @@ def generateSetLocalsDictCode(statement, emit, context):
 
     emit(
         """\
-%(locals_dict)s = MAKE_DICT_EMPTY();"""
+%(locals_dict)s = MAKE_DICT_EMPTY(tstate);"""
         % {"locals_dict": locals_declaration}
     )
 
@@ -109,11 +96,11 @@ def generateLocalsDictSetCode(statement, emit, context):
 
     is_dict = locals_scope.hasShapeDictionaryExact()
 
-    res_name = context.getIntResName()
-
     if is_dict:
+        res_name = context.getBoolResName()
+
         emit(
-            "%s = PyDict_SetItem(%s, %s, %s);"
+            "%s = DICT_SET_ITEM(%s, %s, %s);"
             % (
                 res_name,
                 locals_declaration,
@@ -121,7 +108,17 @@ def generateLocalsDictSetCode(statement, emit, context):
                 value_arg_name,
             )
         )
+
+        getErrorExitBoolCode(
+            condition="%s == false" % res_name,
+            release_name=value_arg_name,
+            needs_check=statement.mayRaiseException(BaseException),
+            emit=emit,
+            context=context,
+        )
     else:
+        res_name = context.getIntResName()
+
         emit(
             "%s = PyObject_SetItem(%s, %s, %s);"
             % (
@@ -132,13 +129,13 @@ def generateLocalsDictSetCode(statement, emit, context):
             )
         )
 
-    getErrorExitBoolCode(
-        condition="%s != 0" % res_name,
-        release_name=value_arg_name,
-        needs_check=statement.mayRaiseException(BaseException),
-        emit=emit,
-        context=context,
-    )
+        getErrorExitBoolCode(
+            condition="%s != 0" % res_name,
+            release_name=value_arg_name,
+            needs_check=statement.mayRaiseException(BaseException),
+            emit=emit,
+            context=context,
+        )
 
 
 def generateLocalsDictDelCode(statement, emit, context):
@@ -208,7 +205,7 @@ def generateLocalsDictVariableRefOrFallbackCode(to_name, expression, emit, conte
 
         is_dict = locals_scope.hasShapeDictionaryExact()
 
-        assert not context.needsCleanup(value_name)
+        needs_ref = context.needsCleanup(value_name)
 
         if is_dict:
             template = template_read_locals_dict_with_fallback
@@ -219,12 +216,22 @@ def generateLocalsDictVariableRefOrFallbackCode(to_name, expression, emit, conte
                 % {
                     "to_name": value_name,
                     "locals_dict": locals_declaration,
+                    "dict_get_item": (
+                        "DICT_GET_ITEM1" if needs_ref else "DICT_GET_ITEM0"
+                    ),
                     "fallback": fallback_codes,
                     "var_name": context.getConstantCode(constant=variable_name),
                 }
             )
+
+            if needs_ref:
+                context.addCleanupTempName(value_name)
         else:
-            template = template_read_locals_mapping_with_fallback
+            if needs_ref:
+                template = template_read_locals_mapping_with_fallback_ref
+            else:
+                template = template_read_locals_mapping_with_fallback_no_ref
+
             fallback_codes = indented(fallback_emit.codes, 2)
 
             emit(
@@ -240,7 +247,8 @@ def generateLocalsDictVariableRefOrFallbackCode(to_name, expression, emit, conte
 
             # If the fallback took no reference, then make it do it
             # anyway.
-            context.addCleanupTempName(value_name)
+            if not needs_ref:
+                context.addCleanupTempName(value_name)
 
 
 def generateLocalsDictVariableRefCode(to_name, expression, emit, context):
@@ -327,3 +335,19 @@ def generateLocalsDictVariableCheckCode(to_name, expression, emit, context):
         to_name.getCType().emitAssignmentCodeFromBoolCondition(
             to_name=to_name, condition="%s == 1" % tmp_name, emit=emit
         )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/LoopCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Loop codes.
 
 Code generation for loops, breaking them, or continuing them. In Nuitka, there
@@ -84,3 +70,19 @@ def generateLoopCode(statement, emit, context):
 
     if loop_end_label is not None:
         getLabelCode(loop_end_label, emit)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/MatchCodes.py

@@ -1,25 +1,10 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code generation for match statement helpers.
 
 """
 
-
 from .CodeHelpers import (
     generateChildExpressionsCode,
     withObjectCodeTemporaryAssignment,
@@ -28,20 +13,55 @@ from .ErrorCodes import getErrorExitCode
 
 
 def generateMatchArgsCode(to_name, expression, emit, context):
-    (matched_name,) = generateChildExpressionsCode(
+    (matched_value_name, match_type_name) = generateChildExpressionsCode(
         expression=expression, emit=emit, context=context
     )
 
+    # TODO: Prefer "PyObject **" of course once we have that.
+    keywords = expression.getKeywordArgs()
+
+    if keywords:
+        keywords_name = context.getConstantCode(constant=keywords)
+        keywords_name = "&PyTuple_GET_ITEM(%s, 0)" % keywords_name
+    else:
+        keywords_name = "NULL"
+
     with withObjectCodeTemporaryAssignment(
         to_name, "match_args_value", expression, emit, context
     ) as value_name:
         emit(
-            "%s = MATCH_CLASS_ARGS(tstate, %s, %d);"
-            % (value_name, matched_name, expression.max_allowed)
+            "%s = MATCH_CLASS_ARGS(tstate, %s, %s, %d, %s, %d);"
+            % (
+                value_name,
+                matched_value_name,
+                match_type_name,
+                expression.getPositionalArgsCount(),
+                keywords_name,
+                len(keywords),
+            )
         )
 
         getErrorExitCode(
-            check_name=value_name, release_name=matched_name, emit=emit, context=context
+            check_name=value_name,
+            release_names=(matched_value_name, match_type_name),
+            emit=emit,
+            context=context,
         )
 
         context.addCleanupTempName(value_name)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/ModuleCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code to generate and interact with compiled module objects.
 
 """
@@ -22,6 +8,7 @@
 from nuitka import Options
 from nuitka.__past__ import iterItems
 from nuitka.code_generation import Emission
+from nuitka.utils.CStrings import encodePythonStringToC
 from nuitka.Version import getNuitkaVersion, getNuitkaVersionYear
 
 from .CodeHelpers import (
@@ -129,8 +116,27 @@ def getModuleCode(
         module.getRuntimePackageValue() if is_dunder_main else ""
     )
 
+    if str is bytes:
+        module_dll_entry_point = "init" + module_identifier
+        module_def_size = -1
+    else:
+        try:
+            module_dll_entry_point = module_name.encode("ascii")
+            module_dll_entry_point_prefix = "PyInit_"
+            module_def_size = -1
+        except UnicodeEncodeError:
+            module_dll_entry_point = module_name.encode("punycode")
+            module_dll_entry_point_prefix = "PyInitU_"
+            module_def_size = 0
+
+        module_dll_entry_point = (
+            module_dll_entry_point_prefix + module_dll_entry_point.decode("ascii")
+        )
+
     return template % {
-        "module_name": module_name,
+        "module_name_cstr": encodePythonStringToC(
+            module_name.asString().encode("utf8")
+        ),
         "version": getNuitkaVersion(),
         "year": getNuitkaVersionYear(),
         "is_top": 1 if module.isTopModule() else 0,
@@ -142,12 +148,15 @@ def getModuleCode(
         "module_functions_code": function_body_codes,
         "module_function_table_entries": indented(function_table_entries_decl),
         "temps_decl": indented(local_var_inits),
-        "module_code": indented(module_codes.codes),
+        "module_init_codes": indented(context.getModuleInitCodes()),
+        "module_codes": indented(module_codes.codes),
         "module_exit": module_exit,
         "module_code_objects_decl": indented(module_code_objects_decl, 0),
-        "module_code_objects_init": indented(module_code_objects_init, 1),
+        "module_code_objects_init": indented(module_code_objects_init),
         "constants_count": context.getConstantsCount(),
         "module_const_blob_name": module_const_blob_name,
+        "module_dll_entry_point": module_dll_entry_point,
+        "module_def_size": module_def_size,
     }
 
 
@@ -171,8 +180,17 @@ def generateModuleAttributeCode(to_name, expression, emit, context):
     )
 
 
-def generateNuitkaLoaderCreationCode(to_name, expression, emit, context):
-    with withObjectCodeTemporaryAssignment(
-        to_name, "nuitka_loader_value", expression, emit, context
-    ) as result_name:
-        emit("%s = Nuitka_Loader_New(loader_entry);" % result_name)
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/Namify.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Namify constants.
 
 This determines the identifier names of constants in the generated code. We
@@ -23,14 +9,12 @@ it is really necessary.
 
 """
 
-
-import hashlib
 import math
 import re
 import sys
 from types import BuiltinFunctionType
 
-from nuitka.__past__ import GenericAlias, UnionType, long, unicode, xrange
+from nuitka.__past__ import GenericAlias, UnionType, long, md5, unicode, xrange
 from nuitka.Builtins import builtin_anon_values, builtin_named_values_list
 from nuitka.Tracing import general
 
@@ -49,6 +33,8 @@ def namifyConstant(constant):
     if constant_type is int:
         if constant == 0:
             result = "int_0"
+        elif constant < -10000000 or constant > 10000000:
+            result = "int_hex_%s" % hex(constant)[2:]
         elif constant > 0:
             result = "int_pos_%d" % constant
         else:
@@ -210,6 +196,8 @@ def _namifyString(string):
         return "slash"
     elif string == "\\":
         return "backslash"
+    elif string == "_":
+        return "underscore"
     elif (
         type(string) is str
         and _re_str_needs_no_digest.match(string)
@@ -244,10 +232,26 @@ def _isAscii(string):
 def _digest(value):
     if str is bytes:
         # Python2 is simple
-        return hashlib.md5(value).hexdigest()
+        return md5(value).hexdigest()
     else:
         # Python3 needs to encode the string if it is one.
         if type(value) is bytes:
-            return hashlib.md5(value).hexdigest()
+            return md5(value).hexdigest()
         else:
-            return hashlib.md5(value.encode("utf8")).hexdigest()
+            return md5(value.encode("utf8")).hexdigest()
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.