mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't worry about moving imp.get_tag() over to Lib/imp.py.

This commit is contained in:
Brett Cannon 2012-04-21 18:55:51 -04:00
parent b582c923ba
commit 2f92389d5c
3 changed files with 3096 additions and 3091 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/imp.py
View File

@ -11,9 +11,9 @@
init_builtin, init_frozen, is_builtin, is_frozen, init_builtin, init_frozen, is_builtin, is_frozen,
_fix_co_filename) _fix_co_filename)
# Could move out of _imp, but not worth the code # Could move out of _imp, but not worth the code
from _imp import get_magic from _imp import get_magic, get_tag
# Can (probably) move to importlib # Can (probably) move to importlib
from _imp import (get_tag, get_suffixes) from _imp import get_suffixes
# Should be re-implemented here (and mostly deprecated) # Should be re-implemented here (and mostly deprecated)
from _imp import (find_module, NullImporter, from _imp import (find_module, NullImporter,
SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION, SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION,

4
Lib/importlib/_bootstrap.py
View File

@ -201,7 +201,7 @@ def _cache_from_source(path, debug_override=None):
suffix = DEBUG_BYTECODE_SUFFIX if debug else OPT_BYTECODE_SUFFIX suffix = DEBUG_BYTECODE_SUFFIX if debug else OPT_BYTECODE_SUFFIX
head, tail = _path_split(path) head, tail = _path_split(path)
base_filename, sep, _ = tail.partition('.') base_filename, sep, _ = tail.partition('.')
filename = ''.join([base_filename, sep, _imp.get_tag(), suffix]) filename = ''.join([base_filename, sep, _TAG, suffix])
return _path_join(head, PYCACHE, filename) return _path_join(head, PYCACHE, filename)
@ -1148,6 +1148,7 @@ def __import__(name, globals={}, locals={}, fromlist=[], level=0):
_MAGIC_NUMBER = None # Set in _setup() _MAGIC_NUMBER = None # Set in _setup()
_TAG = None # Set in _setup()
def _setup(sys_module, _imp_module): def _setup(sys_module, _imp_module):
@ -1197,6 +1198,7 @@ def _setup(sys_module, _imp_module):
# Constants # Constants
setattr(self_module, '_relax_case', _make_relax_case()) setattr(self_module, '_relax_case', _make_relax_case())
setattr(self_module, '_MAGIC_NUMBER', _imp_module.get_magic()) setattr(self_module, '_MAGIC_NUMBER', _imp_module.get_magic())
setattr(self_module, '_TAG', _imp.get_tag())
if builtin_os == 'nt': if builtin_os == 'nt':
SOURCE_SUFFIXES.append('.pyw') SOURCE_SUFFIXES.append('.pyw')

6179
Python/importlib.h
View File

File diff suppressed because it is too large Load Diff