Clean up import hierarchy

PythonExtension.QtCreator.*
  -> QtCreator.*
PythonExtension.PluginInstance
  -> QtCreator.PythonExtensions

Also enables imports of the form "from QtCreator import Core" it is no
longer necessary to write QtCreator.Core....

Change-Id: Ib9b433868dcc3fc7d1d534c6023bae7bf6d05fec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/python/extensionmanager/actions.py b/python/extensionmanager/actions.py
index 7f05e77..48e5ae4 100644
--- a/python/extensionmanager/actions.py
+++ b/python/extensionmanager/actions.py
@@ -41,7 +41,7 @@
 # Functions for installing and deleting extensions
 
 import sys, zipfile
-from PythonExtension import PluginInstance as instance
+from QtCreator import PythonExtensions
 from send2trash import send2trash
 
 def install(path):
@@ -59,14 +59,14 @@ def install(path):
                 return "The .zip file is malformed."
         # Make sure the extension manager does not overwrite
         # extensions that are already installed
-        for ext in instance.extensionList():
+        for ext in PythonExtensions.extensionList():
             if extName == ext.name:
                 return "The extension \"{}\" is already installed. Uninstall it before trying again.".format(extName)
-        extZip.extractall(instance.extensionDir().absolutePath())
+        extZip.extractall(PythonExtensions.extensionDir().absolutePath())
         extZip.close()
     except Exception as e:
         return str(e)
     return True
 
 def uninstall(ext):
-    send2trash(instance.extensionDir().absolutePath() + "/" + ext)
+    send2trash(PythonExtensions.extensionDir().absolutePath() + "/" + ext)