Merge "If only .pyc exist, the extension API will be disabled" into stable/queens
This commit is contained in:
commit
cd8c004550
|
@ -273,12 +273,16 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
|
|||
else:
|
||||
relpkg = '.%s' % '.'.join(relpath.split(os.sep))
|
||||
|
||||
# Now, consider each file in turn, only considering .py files
|
||||
# Now, consider each file in turn, only considering .py and .pyc files
|
||||
for fname in filenames:
|
||||
root, ext = os.path.splitext(fname)
|
||||
|
||||
# Skip __init__ and anything that's not .py
|
||||
if ext != '.py' or root == '__init__':
|
||||
# Skip __init__ and anything that's not .py and .pyc
|
||||
if (ext not in ('.py', '.pyc')) or root == '__init__':
|
||||
continue
|
||||
|
||||
# If .pyc and .py both exist, skip .pyc
|
||||
if ext == '.pyc' and ((root + '.py') in filenames):
|
||||
continue
|
||||
|
||||
# Try loading it
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
`Launchpad bug 1869148 <https://launchpad.net/bugs/1869148>`_ has been
|
||||
fixed. This bug could have affected environments where extension APIs were
|
||||
provided in compiled files rather than source code.
|
||||
|
Loading…
Reference in New Issue