nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Importer: now compatible with Python 3.4

Browse source
This commit is contained in:
nemunaire 2015-05-22 23:56:24 +02:00
parent 481b1974c3
commit fc1bc135df
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nemubot/importer.py
View file

@ -55,14 +55,24 @@ class ModuleLoader(SourceFileLoader):
SourceFileLoader.__init__(self, fullname, path) SourceFileLoader.__init__(self, fullname, path)
def load_module(self, fullname): def _load(self, module, name):
module = SourceFileLoader.load_module(self, fullname)
# Add the module to the global modules list # Add the module to the global modules list
if self.add_module(module): if self.add_module(module):
logger.info("Module '%s' successfully loaded.", module.__name__) logger.info("Module '%s' successfully loaded.", name)
else: else:
logger.error("An error occurs while importing `%s'.", module.__name__) logger.error("An error occurs while importing `%s'.", name)
raise ImportError("An error occurs while importing `%s'." raise ImportError("An error occurs while importing `%s'."
% module.__name__) % name)
return module return module
# Python 3.4
def exec_module(self, module):
super(ModuleLoader, self).exec_module(module)
self._load(module, module.__spec__.name)
# Python 3.3
def load_module(self, fullname):
module = super(ModuleLoader, self).load_module(fullname)
return self._load(module, module.__name__)