eric: comparison Project/CreateDialogCodeDialog.py

-:613426e62983
+:8cad6f50ff4c
 import os
 import json
 import xml.etree.ElementTree
 from PyQt5.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, \
-QMetaMethod, QSortFilterProxyModel, QProcess
+QMetaMethod, QSortFilterProxyModel, QProcess, QProcessEnvironment
 from PyQt5.QtGui import QStandardItemModel, QBrush, QStandardItem
 from PyQt5.QtWidgets import QWidget, QDialog, QDialogButtonBox, QAction
 from PyQt5 import uic
 Public method to determine, if there was an initialzation error.
 @return flag indicating an initialzation error (boolean)
 """
 return self.__initError
-def __objectNameExternal(self):
+def __runUicLoadUi(self, command):
 """
-Private method to get the object name of a form via an external
+Private method to run the UicLoadUi.py script with the given command
-interpreter.
+and return the output.
-@return object name
+@param command uic command to be run
-@rtype str
+@type str
-"""
+@return tuple of process output and error flag
-interpreter = self.project.getDebugProperty("INTERPRETER")
+@rtype tuple of (str, bool)
-objectName = ""
+"""
+venvName = self.project.getDebugProperty("VIRTUALENV")
+venvManager = e5App().getObject("VirtualEnvManager")
+interpreter = venvManager.getVirtualenvInterpreter(venvName)
+execPath = venvManager.getVirtualenvExecPath(venvName)
+env = QProcessEnvironment.systemEnvironment()
+if execPath:
+if env.contains("PATH"):
+env.insert(
+"PATH", os.pathsep.join([execPath, env.value("PATH")])
+)
+else:
+env.insert("PATH", execPath)
 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi.py")
 args = [
 loadUi,
-"object_name",
+command,
 self.formFile,
 self.project.getProjectPath(),
 ]
+uicText = ""
+ok = False
 proc = QProcess()
+proc.setWorkingDirectory(self.project.getProjectPath())
+proc.setProcessEnvironment(env)
 proc.start(interpreter, args)
+started = proc.waitForStarted(5000)
 finished = proc.waitForFinished(30000)
-if finished:
+if started and finished:
-text = proc.readAllStandardOutput()
+output = proc.readAllStandardOutput()
+outText = str(output, "utf-8", "replace")
 if proc.exitCode() == 0:
-objectName = str(text, "utf-8", "replace").strip()
+ok = True
+uicText = outText.strip()
 else:
-errorText = str(text, "utf-8", "replace")
 E5MessageBox.critical(
 self,
 self.tr("uic error"),
 self.tr(
 """<p>There was an error loading the form <b>{0}</b>"""
 """.</p><p>{1}</p>""").format(
-self.formFile, errorText))
+self.formFile, outText)
+)
+else:
+E5MessageBox.critical(
+self,
+self.tr("uic error"),
+self.tr(
+"""<p>The project specific Python interpreter <b>{0}</b>"""
+""" could not be started or did not finish within 30"""
+""" seconds.</p>""").format(interpreter)
+)
+return uicText, ok
+def __objectNameExternal(self):
+"""
+Private method to get the object name of a form via an external
+interpreter.
+@return object name
+@rtype str
+"""
+objectName = ""
+output, ok = self.__runUicLoadUi("object_name")
+if ok and output:
+objectName = output
 return objectName
 def __objectName(self):
 """
 Private method to get the object name of a form.
 @return object name
 @rtype str
 """
-if self.project.getDebugProperty("INTERPRETER"):
+if self.project.getDebugProperty("VIRTUALENV"):
 return self.__objectNameExternal()
 else:
 try:
 dlg = uic.loadUi(
 self.formFile, package=self.project.getProjectPath())
 interpreter.
 @return class name
 @rtype str
 """
-interpreter = self.project.getDebugProperty("INTERPRETER")
 className = ""
-loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi.py")
+output, ok = self.__runUicLoadUi("class_name")
-args = [
+if ok and output:
-loadUi,
+className = output
-"class_name",
-self.formFile,
-self.project.getProjectPath(),
-]
-proc = QProcess()
-proc.start(interpreter, args)
-finished = proc.waitForFinished(30000)
-if finished:
-text = proc.readAllStandardOutput()
-if proc.exitCode() == 0:
-className = str(text, "utf-8", "replace").strip()
-else:
-errorText = str(text, "utf-8", "replace")
-E5MessageBox.critical(
-self,
-self.tr("uic error"),
-self.tr(
-"""<p>There was an error loading the form <b>{0}</b>"""
-""".</p><p>{1}</p>""").format(
-self.formFile, errorText))
 return className
 def __className(self):
 """
 Private method to get the class name of a form.
 @return class name
 @rtype str
 """
-if self.project.getDebugProperty("INTERPRETER"):
+if self.project.getDebugProperty("VIRTUALENV"):
-return self.__objectNameExternal()
+return self.__classNameExternal()
 else:
 try:
 dlg = uic.loadUi(
 self.formFile, package=self.project.getProjectPath())
 return dlg.metaObject().className()
 def __updateSlotsModelExternal(self):
 """
 Private slot to update the slots tree display getting the data via an
 external interpreter.
 """
-interpreter = self.project.getDebugProperty("INTERPRETER")
+output, ok = self.__runUicLoadUi("signatures")
-objectsList = []
+if ok and output:
+objectsList = json.loads(output.strip())
-loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi.py")
-args = [
-loadUi,
-"signatures",
-self.formFile,
-self.project.getProjectPath(),
-]
-proc = QProcess()
-proc.start(interpreter, args)
-finished = proc.waitForFinished(30000)
-if not finished:
-return
-text = proc.readAllStandardOutput()
-if proc.exitCode() != 0:
-errorText = str(text, "utf-8", "replace")
-E5MessageBox.critical(
-self,
-self.tr("uic error"),
-self.tr(
-"""<p>There was an error loading the form <b>{0}</b>"""
-""".</p><p>{1}</p>""").format(
-self.formFile, errorText))
-else:
-objectsListStr = str(text, "utf-8", "replace").strip()
-objectsList = json.loads(objectsListStr)
 signatureList = self.__signatures()
 self.slotsModel.clear()
 self.slotsModel.setHorizontalHeaderLabels([""])
 """
 Private slot to update the slots tree display.
 """
 self.filterEdit.clear()
-if self.project.getDebugProperty("INTERPRETER"):
+if self.project.getDebugProperty("VIRTUALENV"):
 self.__updateSlotsModelExternal()
 else:
 try:
 dlg = uic.loadUi(
 self.formFile, package=self.project.getProjectPath())

Mercurial Repositories > eric / file comparison

comparison: Project/CreateDialogCodeDialog.py

Project/CreateDialogCodeDialog.py