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.

1 files changed, 3 insertions, 16 deletions

diff --git a/Lib/rexec.py b/Lib/rexec.py
index 792fb8e..6ad53b5 100644
--- a/Lib/rexec.py
+++ b/Lib/rexec.py
@@ -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):