Add submodules's path to sys.path for windows platform #852 with corrections

fmv1992 · fmv1992 · commit 30d83bae83d2 · 2018-02-12T15:54:07.000-02:00
diff --git a/pymode/utils.py b/pymode/utils.py
@@ -1,11 +1,11 @@
-""" Pymode utils. """
+"""Pymode utils."""
 import os.path
 import sys
 import threading
 import warnings
 from contextlib import contextmanager
 
-import vim # noqa
+import vim  # noqa
 from ._compat import StringIO
 
 
@@ -16,7 +16,7 @@
 
 @contextmanager
 def silence_stderr():
-    """ Redirect stderr. """
+    """Redirect stderr."""
     if DEBUG:
         yield
 
@@ -36,4 +36,13 @@ def patch_paths():
 
     Load required modules from the plugin's sources.
     """
-    sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs'))
+    dir_script = os.path.dirname(os.path.abspath(__file__))
+    sys.path.insert(0, os.path.join(dir_script, 'libs'))
+    if sys.platform == 'win32':
+        dir_submodule = os.path.abspath(os.path.join(dir_script,
+                                                     '..', 'submodules'))
+        sub_modules = os.listdir(dir_submodule)
+        for module in sub_modules:
+            module_full_path = os.path.join(dir_submodule, module)
+            if module_full_path not in sys.path:
+                sys.path.insert(0, module_full_path)
