_pyc_magic_number -> pyc_magic_number

Author: mdboom

Lib/importlib/_bootstrap_external.py

@@ -221,7 +221,7 @@ def _write_atomic(path, data, mode=0o666):
 
 _code_type = type(_write_atomic.__code__)
 
-MAGIC_NUMBER = (_imp._pyc_magic_number).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (_imp.pyc_magic_number).to_bytes(2, 'little') + b'\r\n'
 
 _PYCACHE = '__pycache__'
 _OPT = 'opt-'
@@ -860,7 +860,7 @@ def get_code(self, fullname):
                                  _imp.check_hash_based_pycs == 'always')):
                                 source_bytes = self.get_data(source_path)
                                 source_hash = _imp.source_hash(
-                                    _imp._pyc_magic_number_token,
+                                    _imp.pyc_magic_number_token,
                                     source_bytes,
                                 )
                                 _validate_hash_pyc(data, source_hash, fullname,
@@ -889,7 +889,7 @@ def get_code(self, fullname):
                 source_mtime is not None):
             if hash_based:
                 if source_hash is None:
-                    source_hash = _imp.source_hash(_imp._pyc_magic_number_token,
+                    source_hash = _imp.source_hash(_imp.pyc_magic_number_token,
                                                    source_bytes)
                 data = _code_to_hash_pyc(code_object, source_hash, check_source)
             else:

Lib/importlib/util.py

@@ -17,7 +17,7 @@
 
 def source_hash(source_bytes):
     "Return the hash of *source_bytes* as used in hash-based pyc files."
-    return _imp.source_hash(_imp._pyc_magic_number_token, source_bytes)
+    return _imp.source_hash(_imp.pyc_magic_number_token, source_bytes)
 
 
 def resolve_name(name, package):

Lib/test/test_import/__init__.py

@@ -3116,10 +3116,10 @@ def test_pyimport_addmodule_create(self):
 @cpython_only
 class TestMagicNumber(unittest.TestCase):
     def test_magic_number_endianness(self):
-        magic_number = (_imp._pyc_magic_number).to_bytes(2, 'little') + b'\r\n'
+        magic_number = (_imp.pyc_magic_number).to_bytes(2, 'little') + b'\r\n'
         raw_magic_number = int.from_bytes(magic_number, 'little')
 
-        assert raw_magic_number == _imp._pyc_magic_number_token
+        assert raw_magic_number == _imp.pyc_magic_number_token
 
 
 if __name__ == '__main__':

Lib/zipimport.py

@@ -705,7 +705,7 @@ def _unmarshal_code(self, pathname, fullpath, fullname, data):
             source_bytes = _get_pyc_source(self, fullpath)
             if source_bytes is not None:
                 source_hash = _imp.source_hash(
-                    _imp._pyc_magic_number_token,
+                    _imp.pyc_magic_number_token,
                     source_bytes,
                 )
 

Python/import.c

@@ -4811,11 +4811,11 @@ imp_module_exec(PyObject *module)
         return -1;
     }
 
-    if (PyModule_AddIntConstant(module, "_pyc_magic_number", PYC_MAGIC_NUMBER) < 0) {
+    if (PyModule_AddIntConstant(module, "pyc_magic_number", PYC_MAGIC_NUMBER) < 0) {
         return -1;
     }
 
-    if (PyModule_AddIntConstant(module, "_pyc_magic_number_token", PYC_MAGIC_NUMBER_TOKEN) < 0) {
+    if (PyModule_AddIntConstant(module, "pyc_magic_number_token", PYC_MAGIC_NUMBER_TOKEN) < 0) {
         return -1;
     }