Merge from 2.3: Add a simpler way to check for rope supported versions

blink1073 · Nov 29, 2015 · e96d67f · e96d67f
2 parents f460d5d + 24ed430
commit e96d67f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/create_app.py b/create_app.py
@@ -156,7 +156,7 @@ def get_stdlib_modules():
         shutil.copy2(osp.join(system_python_lib, i),
                      osp.join(app_python_lib, i))
 
-# Copy path.py for IPython
+# Copy dependencies for IPython/Jupyter
 IPYDEPS = ['path.py', 'simplegeneric.py', 'decorator.py', 'mistune.py',
            'mistune.so', 'pickleshare.py']
 for dep in IPYDEPS:

diff --git a/spyderlib/rope_patch.py b/spyderlib/rope_patch.py
@@ -31,8 +31,9 @@ def apply():
     """Monkey patching rope
 
     See [1], [2], [3], [4] and [5] in module docstring."""
-    import rope
-    if rope.VERSION not in ('0.10.2', '0.9.4-1', '0.9.4'):
+    from spyderlib.utils.programs import is_module_installed
+    if is_module_installed('rope', '<0.9.4'):
+        import rope
         raise ImportError("rope %s can't be patched" % rope.VERSION)
 
     # [1] Patching project.Project for compatibility with py2exe/cx_Freeze