eric: comparison eric6/Project/Project.py

-:8c3d033e5044
+:0cdead130a81
 super(Project, self).__init__(parent)
 self.ui = parent
 self.__progLanguages = [
-"Python2",
 "Python3",
 "MicroPython",
 "Ruby",
 "JavaScript",
 ]
 self.__dbgFilters = {
-"Python2": self.tr(
-"Python2 Files (*.py2);;"
-"Python2 GUI Files (*.pyw2);;"),
 "Python3": self.tr(
 "Python3 Files (*.py *.py3);;"
 "Python3 GUI Files (*.pyw *.pyw3);;"),
 }
 Private method to get the source extensions of a programming language.
 @param language programming language (string)
 @return source extensions (list of string)
 """
-if language == "Python2":
+if language == "Python3":
-extensions = Preferences.getPython("PythonExtensions")
-# *.py and *.pyw should always be associated with source files
-for ext in [".py", ".pyw"]:
-if ext not in extensions:
-extensions.append(ext)
-return extensions
-elif language == "Python3":
 extensions = Preferences.getPython("Python3Extensions")
 # *.py and *.pyw should always be associated with source files
 for ext in [".py", ".pyw"]:
 if ext not in extensions:
 extensions.append(ext)
 self.__fileTypeCallbacks = {}
 self.__lexerAssociationCallbacks = {}
 self.__binaryTranslationsCallbacks = {}
 self.__projectTypes = {
-"Qt4": self.tr("PyQt4 GUI (deprecated)"),
-"Qt4C": self.tr("PyQt4 Console (deprecated)"),
 "PyQt5": self.tr("PyQt5 GUI"),
 "PyQt5C": self.tr("PyQt5 Console"),
 "E6Plugin": self.tr("Eric6 Plugin"),
 "Console": self.tr("Console"),
 "Other": self.tr("Other"),
 }
 self.__projectProgLanguages = {
-"Python2": ["Qt4", "Qt4C", "PyQt5", "PyQt5C",
+"Python3": ["PyQt5", "PyQt5C", "E6Plugin", "Console", "Other"],
-"E6Plugin", "Console", "Other"],
-"Python3": ["Qt4", "Qt4C", "PyQt5", "PyQt5C",
-"E6Plugin", "Console", "Other"],
 "MicroPython": ["Console", "Other"],
-"Ruby": ["Qt4", "Qt4C", "Console", "Other"],
+"Ruby": ["Console", "Other"],
 "JavaScript": ["Other"],
 }
-pyside_py2, pyside_py3 = Utilities.checkPyside("1")
+if Utilities.checkPyside():
-if pyside_py2 or pyside_py3:
-self.__projectTypes["PySide"] = self.tr("PySide GUI")
-self.__projectTypes["PySideC"] = self.tr("PySide Console")
-if pyside_py2:
-self.__projectProgLanguages["Python2"].extend(
-["PySide", "PySideC"])
-if pyside_py3:
-self.__projectProgLanguages["Python3"].extend(
-["PySide", "PySideC"])
-pyside2_py2, pyside2_py3 = Utilities.checkPyside("2")
-if pyside2_py2 or pyside2_py3:
 self.__projectTypes["PySide2"] = self.tr("PySide2 GUI")
 self.__projectTypes["PySide2C"] = self.tr("PySide2 Console")
-if pyside2_py2:
+self.__projectProgLanguages["Python3"].extend(
-self.__projectProgLanguages["Python2"].extend(
+["PySide2", "PySide2C"])
-["PySide2", "PySide2C"])
-if pyside2_py3:
-self.__projectProgLanguages["Python3"].extend(
-["PySide2", "PySide2C"])
 def getProjectTypes(self, progLanguage=""):
 """
 Public method to get the list of supported project types.
 @keyparam progLanguages programming languages supported by the
 project type (list of string)
 """
 if progLanguages:
 for progLanguage in progLanguages:
+if progLanguage in ["Python", "Python2"]:
+# ignore that silently for Python2
+return
 if progLanguage not in self.__projectProgLanguages:
 E5MessageBox.critical(
 self.ui,
 self.tr("Registering Project Type"),
 self.tr(
 """<p>The Programming Language <b>{0}</b> is not"""
-""" supported.</p>""")
+""" supported (project type: {1}).</p>""")
-.format(progLanguage)
+.format(progLanguage, type_)
 )
 return
 if type_ in self.__projectProgLanguages[progLanguage]:
 E5MessageBox.critical(
 # Protobuf Files
 self.pdata["FILETYPES"]["*.proto"] = "PROTOCOLS"
 # Forms
-if self.pdata["PROJECTTYPE"] in ["Qt4", "PyQt5",
+if self.pdata["PROJECTTYPE"] in ["E6Plugin",
-"E6Plugin", "PySide",
+"PyQt5",
 "PySide2"]:
 self.pdata["FILETYPES"]["*.ui"] = "FORMS"
 # Resources
-if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
+if self.pdata["PROJECTTYPE"] in ["E6Plugin",
-"E6Plugin",
 "PyQt5", "PyQt5C",
-"PySide", "PySideC",
 "PySide2", "PySide2C"]:
 self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
 # Translations
-if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
+if self.pdata["PROJECTTYPE"] in ["E6Plugin",
-"E6Plugin",
 "PyQt5", "PyQt5C",
-"PySide", "PySideC",
 "PySide2", "PySide2C"]:
 self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
 self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
 # Project type specific ones
 def updateFileTypes(self):
 """
 Public method to update the filetype associations with new default
 values.
 """
-if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
+if self.pdata["PROJECTTYPE"] in ["E6Plugin",
-"E6Plugin",
 "PyQt5", "PyQt5C",
-"PySide", "PySideC",
 "PySide2", "PySide2C"]:
 if "*.ts" not in self.pdata["FILETYPES"]:
 self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
 if "*.qm" not in self.pdata["FILETYPES"]:
 self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
 from .AddLanguageDialog import AddLanguageDialog
 dlg = AddLanguageDialog(self.parent())
 if dlg.exec_() == QDialog.Accepted:
 lang = dlg.getSelectedLanguage()
 if self.pdata["PROJECTTYPE"] in [
-"Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+"PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
-"PySide", "PySideC", "PySide2", "PySide2C"
 ]:
 langFile = self.pdata["TRANSLATIONPATTERN"].replace(
 "%language%", lang)
 self.appendFile(langFile)
 self.projectLanguageAddedByCode.emit(lang)
 return
 # create an empty __init__.py file to make it a Python package
 # (only for Python and Python3)
 if self.pdata["PROGLANGUAGE"] in [
-"Python", "Python2", "Python3", "MicroPython"
+"Python3", "MicroPython"
 ]:
 fn = os.path.join(self.ppath, "__init__.py")
 f = open(fn, "w", encoding="utf-8")
 f.close()
 self.appendFile(fn, True)
 self.newProjectAddFiles(ms)
 addAllToVcs = res
 # create an empty __init__.py file to make it a Python package
 # if none exists (only for Python and Python3)
 if self.pdata["PROGLANGUAGE"] in [
-"Python", "Python2", "Python3", "MicroPython"
+"Python3", "MicroPython"
 ]:
 fn = os.path.join(self.ppath, "__init__.py")
 if not os.path.exists(fn):
 f = open(fn, "w", encoding="utf-8")
 f.close()
 for qm in qmlist:
 self.pdata["TRANSLATIONS"].append(qm)
 self.projectLanguageAdded.emit(qm)
 if not self.pdata["MAINSCRIPT"] and bool(mainscriptname):
 if self.pdata["PROGLANGUAGE"] in [
-"Python", "Python2", "Python3", "MicroPython"
+"Python3", "MicroPython"
 ]:
 self.pdata["MAINSCRIPT"] = '{0}.py'.format(mainscriptname)
 elif self.pdata["PROGLANGUAGE"] == "Ruby":
 self.pdata["MAINSCRIPT"] = '{0}.rb'.format(mainscriptname)
 self.setDirty(True)
 """
 return self.pdata["MIXEDLANGUAGE"]
 def isPythonProject(self):
 """
-Public method to check, if this project is a Python2 or Python3
+Public method to check, if this project is a Python3 or MicroPython
 project.
 @return flag indicating a Python project (boolean)
 """
-return self.pdata["PROGLANGUAGE"] in ["Python", "Python2",
+return self.pdata["PROGLANGUAGE"] in ["Python3", "MicroPython"]
-"Python3", "MicroPython"]
 def isPy3Project(self):
 """
 Public method to check, if this project is a Python3 project.
 @return flag indicating a Python3 project (boolean)
 """
 return self.pdata["PROGLANGUAGE"] == "Python3"
-def isPy2Project(self):
-"""
-Public method to check, if this project is a Python2 project.
-@return flag indicating a Python2 project (boolean)
-"""
-return self.pdata["PROGLANGUAGE"] in ["Python", "Python2"]
 def isMicroPythonProject(self):
 """
 Public method to check, if this project is a MicroPython project.
 @return flag indicating a MicroPython project
 """
 lang = self.pdata["PROGLANGUAGE"]
 if lang == "":
 lang = "Python3"
 elif lang == "Python":
-lang = "Python2"
+lang = "Python3"
 return self.__sourceExtensions(lang)[0]
 def getProjectPath(self):
 """
 Public method to get the project path.
 tbasename = os.path.splitext(tfn)[0]
 self.codeProfileAct.setEnabled(
 os.path.isfile("{0}.profile".format(basename)) or
 os.path.isfile("{0}.profile".format(tbasename)))
 self.codeCoverageAct.setEnabled(
-(self.isPy3Project() or self.isPy2Project()) and
+self.isPy3Project() and
 (os.path.isfile("{0}.coverage".format(basename)) or
 os.path.isfile("{0}.coverage".format(tbasename))))
 else:
 self.codeProfileAct.setEnabled(False)
 self.codeCoverageAct.setEnabled(False)

Mercurial Repositories > eric / file comparison

comparison: eric6/Project/Project.py

eric6/Project/Project.py