sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base: Make the Python module loader PEP302 compliant

Browse source 
The custom Python loader didn't comply with PEP302 for two reasons:

 * Previously, we would overwrite old modules on name
   conflicts. PEP302 explicitly states that: "If there is an existing
   module object named 'fullname' in sys.modules, the loader must use
   that existing module".

 * The "__package__" attribute wasn't set. PEP302: "The __package__
   attribute must be set."

This changeset addresses both of these issues.
This commit is contained in:
Andreas Sandberg 2013-06-03 13:51:03 +02:00
parent d989a3ad50
commit 63dae28703
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/python/importer.py
View file

@ -54,8 +54,12 @@ class CodeImporter(object):
import imp import imp
import os import os
import sys import sys
mod = imp.new_module(fullname)
sys.modules[fullname] = mod try:
mod = sys.modules[fullname]
except KeyError:
mod = imp.new_module(fullname)
sys.modules[fullname] = mod
try: try:
mod.__loader__ = self mod.__loader__ = self
@ -68,6 +72,9 @@ class CodeImporter(object):
if os.path.basename(srcfile) == '__init__.py': if os.path.basename(srcfile) == '__init__.py':
mod.__path__ = fullname.split('.') mod.__path__ = fullname.split('.')
mod.__package__ = fullname
else:
mod.__package__ = fullname.rpartition('.')[0]
mod.__file__ = srcfile mod.__file__ = srcfile
exec code in mod.__dict__ exec code in mod.__dict__