Migrate to Rope 0.9.4

klen · klen · commit 23cf7e5d7c0d · 2012-05-24T21:04:58.000+04:00
diff --git a/pylibs/rope/__init__.py b/pylibs/rope/__init__.py
@@ -1,10 +1,10 @@
 """rope, a python refactoring library"""
 
 INFO = __doc__
-VERSION = '0.9.3'
+VERSION = '0.9.4'
 COPYRIGHT = """\
-Copyright (C) 2006-2010 Ali Gholami Rudi
-Copyright (C) 2009-2010 Anton Gritsay
+Copyright (C) 2006-2012 Ali Gholami Rudi
+Copyright (C) 2009-2012 Anton Gritsay
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of GNU General Public License as published by the
diff --git a/pylibs/rope/base/libutils.py b/pylibs/rope/base/libutils.py
@@ -33,9 +33,9 @@ def relative(root, path):
     root = rope.base.project._realpath(root).replace(os.path.sep, '/')
     path = rope.base.project._realpath(path).replace(os.path.sep, '/')
     if path == root:
-        return ''
+    	return ''
     if path.startswith(root + '/'):
-        return path[len(root) + 1:]
+    	return path[len(root) + 1:]
 
 def report_change(project, path, old_content):
     """Report that the contents of file at `path` was changed
diff --git a/pylibs/rope/base/pycore.py b/pylibs/rope/base/pycore.py
@@ -75,12 +75,13 @@ def is_python_file(self, resource):
 
     def get_module(self, name, folder=None):
         """Returns a `PyObject` if the module was found."""
+        # check if this is a builtin module
+        pymod = self._builtin_module(name)
+        if pymod is not None:
+             return pymod
         module = self.find_module(name, folder)
         if module is None:
-            module = self._builtin_module(name)
-            if module is None:
-                raise ModuleNotFoundError('Module %s not found' % name)
-            return module
+            raise ModuleNotFoundError('Module %s not found' % name)
         return self.resource_to_pyobject(module)
 
     def _builtin_submodules(self, modname):
