1From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 2From: Christophe Vu-Brugier <cvubrugier@fastmail.fm> 3Date: Wed, 22 Feb 2017 16:48:49 -0800 4Subject: [PATCH] Add importlib fix for PEP 3147 issue 5 6Python 3 has a new standard for installing .pyc file, called PEP 73147. Unfortunately, this standard requires both the .py and .pyc 8files to be installed for a Python module to be found. This is quite 9annoying on space-constrained embedded systems, since the .py file is 10technically not required for execution. 11 12This patch changes cache_from_source() and source_from_cache() in 13importlib to get rid of the "__pycache__" directory. 14This effectively disables PEP 3147 for: 15 16* The python standard library 17* Packages built with distutils or setuptools 18* Packages built with automake that use the `py-compile` helper 19 20Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm> 21[ Andrey Smirnov: ported to Python 3.6 ] 22Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> 23--- 24 Lib/importlib/_bootstrap_external.py | 44 ++++------------------------ 25 1 file changed, 5 insertions(+), 39 deletions(-) 26 27diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py 28index 25a3f8c0e0..2cb9a9aa52 100644 29--- a/Lib/importlib/_bootstrap_external.py 30+++ b/Lib/importlib/_bootstrap_external.py 31@@ -392,8 +392,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): 32 a True value is the same as setting 'optimization' to the empty string 33 while a False value is equivalent to setting 'optimization' to '1'. 34 35- If sys.implementation.cache_tag is None then NotImplementedError is raised. 36- 37 """ 38 if debug_override is not None: 39 _warnings.warn('the debug_override parameter is deprecated; use ' 40@@ -405,10 +403,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): 41 path = _os.fspath(path) 42 head, tail = _path_split(path) 43 base, sep, rest = tail.rpartition('.') 44- tag = sys.implementation.cache_tag 45- if tag is None: 46- raise NotImplementedError('sys.implementation.cache_tag is None') 47- almost_filename = ''.join([(base if base else rest), sep, tag]) 48+ almost_filename = ''.join([(base if base else rest)]) 49 if optimization is None: 50 if sys.flags.optimize == 0: 51 optimization = '' 52@@ -445,46 +440,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): 53 head.lstrip(path_separators), 54 filename, 55 ) 56- return _path_join(head, _PYCACHE, filename) 57+ return _path_join(head, filename) 58 59 60 def source_from_cache(path): 61 """Given the path to a .pyc. file, return the path to its .py file. 62 63 The .pyc file does not need to exist; this simply returns the path to 64- the .py file calculated to correspond to the .pyc file. If path does 65- not conform to PEP 3147/488 format, ValueError will be raised. If 66- sys.implementation.cache_tag is None then NotImplementedError is raised. 67- 68+ the .py file calculated to correspond to the .pyc file. 69 """ 70- if sys.implementation.cache_tag is None: 71- raise NotImplementedError('sys.implementation.cache_tag is None') 72- path = _os.fspath(path) 73- head, pycache_filename = _path_split(path) 74- found_in_pycache_prefix = False 75- if sys.pycache_prefix is not None: 76- stripped_path = sys.pycache_prefix.rstrip(path_separators) 77- if head.startswith(stripped_path + path_sep): 78- head = head[len(stripped_path):] 79- found_in_pycache_prefix = True 80- if not found_in_pycache_prefix: 81- head, pycache = _path_split(head) 82- if pycache != _PYCACHE: 83- raise ValueError(f'{_PYCACHE} not bottom-level directory in ' 84- f'{path!r}') 85- dot_count = pycache_filename.count('.') 86- if dot_count not in {2, 3}: 87- raise ValueError(f'expected only 2 or 3 dots in {pycache_filename!r}') 88- elif dot_count == 3: 89- optimization = pycache_filename.rsplit('.', 2)[-2] 90- if not optimization.startswith(_OPT): 91- raise ValueError("optimization portion of filename does not start " 92- f"with {_OPT!r}") 93- opt_level = optimization[len(_OPT):] 94- if not opt_level.isalnum(): 95- raise ValueError(f"optimization level {optimization!r} is not an " 96- "alphanumeric value") 97- base_filename = pycache_filename.partition('.')[0] 98+ head, filename = _path_split(path) 99+ base_filename = filename.partition('.')[0] 100 return _path_join(head, base_filename + SOURCE_SUFFIXES[0]) 101 102 103-- 1042.25.1 105 106