Pyramid Project: comparison ProjectPyramid/Project.py

-:6853468b870d
+:2b0933087db9
 @param cmd start the given program cmd (string)
 @keyparam args list of parameters (list of strings)
 @keyparam mode access mode (QIODevice.OpenMode)
 """
-if cmd.endswith('gnome-terminal') and args[0] == '-e':
+if cmd.endswith(('gnome-terminal', 'konsole', 'xfce4-terminal',
-args = ['-e', ' '.join(args[1:])]
+'mate-terminal')):
+if '-e' in args:
+index = args.index('-e') + 1
+cargs = ' '.join(args[index:])
+args[index:] = [cargs]
 super(QProcess, self).start(cmd, args, mode)
 @staticmethod
 def startDetached(cmd, args=[], path=''):
 @param cmd start the given program cmd (string)
 @keyparam args list of parameters (list of strings)
 @keyparam path new working directory (string)
 @return tuple of successful start and process id (boolean, integer)
 """
-if cmd.endswith('gnome-terminal') and args[0] == '-e':
+if cmd.endswith(('gnome-terminal', 'konsole', 'xfce4-terminal',
-args = ['-e', ' '.join(args[1:])]
+'mate-terminal')):
+if '-e' in args:
+index = args.index('-e') + 1
+cargs = ' '.join(args[index:])
+args[index:] = [cargs]
 return QProcessPyQt.startDetached(cmd, args, path)
 class Project(QObject):
 def __pyramidInfo(self):
 """
 Private slot to show some info about Pyramid.
 """
-version = self.getPyramidVersion()
+version = self.getPyramidVersionString()
 url = "http://www.pylonsproject.org/projects/pyramid/about"
 msgBox = E5MessageBox.E5MessageBox(
 E5MessageBox.Question,
 self.tr("About Pyramid"),
 buttons=E5MessageBox.Ok)
 msgBox.setIconPixmap(UI.PixmapCache.getPixmap(
 os.path.join("ProjectPyramid", "icons", "pyramid64.png")))
 msgBox.exec_()
-def getPyramidVersion(self):
+def getPyramidVersionString(self):
 """
-Public method to get the Pyramid version.
+Public method to get the Pyramid version as a string.
-@return Pyramid version (string)
+@return Pyramid version
+@rtype str
 """
 if not self.__pyramidVersion:
 cmd = self.getPyramidCommand("pcreate")
 if isWindowsPlatform():
 cmd = os.path.join(os.path.dirname(cmd), "pcreate-script.py")
 except (IOError, OSError):
 self.__pyramidVersion = ""
 return self.__pyramidVersion
+def getPyramidVersion(self):
+"""
+Public method to get the Pyramid version as a tuple.
+@return Pyramid version
+@rtype tuple of int
+"""
+pyramidVersionStr = self.getPyramidVersionString()
+pyramidVersionList = []
+if pyramidVersionStr:
+for part in pyramidVersionStr.split("."):
+try:
+pyramidVersionList.append(int(part))
+except ValueError:
+pyramidVersionList.append(part)
+return tuple(pyramidVersionList)
 def isSpawningConsole(self, consoleCmd):
 """
 Public method to check, if the given console is a spawning console.
 @param consoleCmd console command (string)
 if consoleCmd and consoleCmd[0] == '@':
 return (True, consoleCmd[1:])
 else:
 return (False, consoleCmd)
+def __adjustWorkingDirectory(self, args, wd):
+"""
+Private method to adjust the working directory in the arguments list.
+@param args list of arguments to be modified
+@type list of str
+@param wd working directory
+@type str
+"""
+if args[0].endswith("konsole") and "--workdir" in args:
+index = args.index("--workdir")
+args[index + 1] = wd
+elif args[0].endswith(("gnome-terminal", "mate-terminal")):
+for index in range(len(args)):
+if args[index].startswith("--working-directory="):
+args[index] = "--working-directory={0}".format(wd)
+break
 ##################################################################
 ## slots below implement creation functions
 ##################################################################
 def __createProject(self):
 config.read(os.path.join(projectPath, "development.ini"))
 try:
 port = config.get("server:main", "port")
 except (configparser.NoOptionError, configparser.NoSectionError):
 port = "8080"
-url = QUrl("http://localhost:{0}".format(port))
+url = "http://localhost:{0}".format(port)
-res = QDesktopServices.openUrl(url)
+if self.__plugin.getPreferences("UseExternalBrowser"):
-if not res:
+res = QDesktopServices.openUrl(QUrl(url))
-E5MessageBox.critical(
+if not res:
-self.__ui,
+E5MessageBox.critical(
-self.tr('Run Web-Browser'),
+self.__ui,
-self.tr('Could not start the web-browser for the URL'
+self.tr('Run Web-Browser'),
-' "{0}".').format(url.toString()))
+self.tr('Could not start the web-browser for the URL'
+' "{0}".').format(url.toString()))
+else:
+self.__ui.launchHelpViewer(url)
 def __runPythonShell(self):
 """
 Private slot to start a Python console for a Pyramid project.
 """
 consoleType = self.__plugin.getPreferences(
 "Python3ConsoleType")
 args.append("--python-shell={0}".format(consoleType))
 args.append(os.path.join(projectPath, "development.ini"))
+self.__adjustWorkingDirectory(args, projectPath)
 started, pid = QProcess.startDetached(
 args[0], args[1:], projectPath)
 if not started:
 E5MessageBox.critical(
 self.__ui,

Mercurial Repositories > Pyramid Project / file comparison

comparison: ProjectPyramid/Project.py

ProjectPyramid/Project.py