PythonCodeCompletion: Allow user to put python setup commands in ~/.codeblocks/share/codeblocks/python/python_completion_config.py (primary purpose is to add directories of cached modules to the python path)

spillz · spillz · commit 166c788f91ba · 2015-01-24T00:12:29.000-05:00
diff --git a/PythonCodeCompletion/PythonCodeCompletion.cpp b/PythonCodeCompletion/PythonCodeCompletion.cpp
@@ -88,6 +88,8 @@ void PythonCodeCompletion::OnAttach()
 
     ConfigManager *mgr=Manager::Get()->GetConfigManager(_T("PythonCC"));
 
+    wxString server_config_module = ConfigManager::GetFolder(sdDataUser)+_T("/python/python_completion_config.py");
+
     wxString script = GetExtraFile(_T("/python/python_completion_server.py"));
     if(script==wxEmptyString)
     {
@@ -96,7 +98,7 @@ void PythonCodeCompletion::OnAttach()
     }
     #ifndef EMBEDDER_DEBUG
     int port = -1; // Port == -1 uses pipe to do RPC over redirected stdin/stdout of the process, otherwise uses a socket
-    wxString command = wxString::Format(_T("python -u %s %i"),script.c_str(),port);
+    wxString command = wxString::Format(_T("python -u %s %i %s"),script.c_str(),port, server_config_module.c_str());
     #else
     int port = 3456;
     wxString command = wxString::Format(_T("xterm -e python -u %s %i"),script.c_str(),port);
diff --git a/PythonCodeCompletion/python/python_completion_server.py b/PythonCodeCompletion/python/python_completion_server.py
@@ -167,7 +167,7 @@ def cmd_err():
     sys.exit()
 
 if __name__=='__main__':
-    if len(sys.argv)!=2:
+    if len(sys.argv)<2:
         port=8001
     else:
         try:
@@ -176,6 +176,17 @@ def cmd_err():
             cmd_err()
         if port<-1:
             cmd_err()
+        if len(sys.argv)>2:
+            config_module_path = sys.argv[2]
+            config_path, module_name = os.path.split(config_module_path)
+            module_name = os.path.splitext(module_name)[0]
+            import importlib
+            try:
+                sys.path.insert(0, config_path)
+                importlib.import_module(module_name)
+            except:
+                #TODO: Do something better than silently failing here
+                pass
 
     server=PythonCompletionServer(port)
     server.run()
