Commit 0e02174b authored by Guido van Rossum's avatar Guido van Rossum

Get rid of the classes RModuleLoader and RModuleImporter -- these were

only there to override reload() in a way that doesn't make a whole lot
of sense and moreover broke since the latest changes in ihooks.
parent 119279de
......@@ -107,22 +107,9 @@ class RHooks(ihooks.Hooks):
return self.rexec.modules['sys'].path
class RModuleLoader(ihooks.FancyModuleLoader):
def load_module(self, name, stuff):
file, filename, info = stuff
m = ihooks.FancyModuleLoader.load_module(self, name, stuff)
m.__filename__ = filename
return m
class RModuleImporter(ihooks.ModuleImporter):
def reload(self, module, path=None):
if path is None and hasattr(module, '__filename__'):
head, tail = os.path.split(module.__filename__)
path = [os.path.join(head, '')]
return ihooks.ModuleImporter.reload(self, module, path)
# XXX Backwards compatibility
RModuleLoader = ihooks.FancyModuleLoader
RModuleImporter = ihooks.ModuleImporter
class RExec(ihooks._Verbose):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment