Removed some more Python2 stuff. without_py2_and_pyqt4

Sun, 01 Sep 2019 19:56:13 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 01 Sep 2019 19:56:13 +0200
branch
without_py2_and_pyqt4
changeset 7199
c71bd6f21748
parent 7198
684261ef2165
child 7200
ebab8ba287e6

Removed some more Python2 stuff.

eric6/E5Network/E5GoogleMail.py file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginAbout.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginCodeStyleChecker.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginEricapi.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginEricdoc.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginSyntaxChecker.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginTabnanny.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginTranslator.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVcsGit.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVcsMercurial.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVcsPySvn.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVcsSubversion.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVmListspace.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginVmTabview.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardDotDesktop.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardE5MessageBox.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardEricPlugin.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardPyRegExp.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQColorDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQFileDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQFontDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQInputDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQMessageBox.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQRegExp.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardQRegularExpression.py file | annotate | diff | comparison | revisions
eric6/Plugins/PluginWizardSetup.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/WizardPlugins/EricPluginWizard/Templates.py file | annotate | diff | comparison | revisions
eric6/Project/DebuggerPropertiesDialog.py file | annotate | diff | comparison | revisions
--- a/eric6/E5Network/E5GoogleMail.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/E5Network/E5GoogleMail.py	Sun Sep 01 19:56:13 2019 +0200
@@ -138,7 +138,7 @@
     
     def __prepareMessage(self, message):
         """
-        Private method to prepare the message for sending (Python2 Variant).
+        Private method to prepare the message for sending.
         
         @param message message to be prepared
         @type email.mime.text.MIMEBase
--- a/eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -81,8 +81,8 @@
             ", ".join(self.parameters['ignoreFilePatterns']))
         for language in self.parameters['languages']:
             if language == "Python":
-                # convert Python to the more specific Python2
-                language = "Python2"
+                # convert Python to the more specific Python3
+                language = "Python3"
             items = self.languagesList.findItems(
                 language, Qt.MatchFlags(Qt.MatchExactly))
             items and items[0].setSelected(True)
--- a/eric6/Plugins/PluginAbout.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginAbout.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the About dialogs."
 longDescription = """This plugin shows the About dialogs."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginCodeStyleChecker.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginCodeStyleChecker.py	Sun Sep 01 19:56:13 2019 +0200
@@ -37,7 +37,6 @@
     """ compliance to docstring conventions given in PEP-257 and an""" \
     """ eric6 variant is used to check against eric conventions."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 
--- a/eric6/Plugins/PluginEricapi.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginEricapi.py	Sun Sep 01 19:56:13 2019 +0200
@@ -36,7 +36,6 @@
     """ Ericapi is used to generate a QScintilla API file for Python and""" \
     """ Ruby projects."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
@@ -143,7 +142,7 @@
             if self.__projectAct is not None:
                 self.__projectAct.setEnabled(
                     e5App().getObject("Project").getProjectLanguage() in
-                    ["Python", "Python2", "Python3", "Ruby", "MicroPython"])
+                    ["Python", "Python3", "Ruby", "MicroPython"])
     
     def __doEricapi(self):
         """
--- a/eric6/Plugins/PluginEricdoc.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginEricdoc.py	Sun Sep 01 19:56:13 2019 +0200
@@ -36,7 +36,6 @@
     """ Ericdoc is used to generate a source code documentation""" \
     """ for Python and Ruby projects."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
@@ -186,7 +185,7 @@
             if self.__projectAct is not None:
                 self.__projectAct.setEnabled(
                     e5App().getObject("Project").getProjectLanguage() in
-                    ["Python", "Python2", "Python3", "Ruby", "MicroPython"])
+                    ["Python", "Python3", "Ruby", "MicroPython"])
     
     def __doEricdoc(self):
         """
--- a/eric6/Plugins/PluginSyntaxChecker.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginSyntaxChecker.py	Sun Sep 01 19:56:13 2019 +0200
@@ -35,7 +35,6 @@
     """ Syntax Checker is used to check Python source files for correct""" \
     """ syntax."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginTabnanny.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginTabnanny.py	Sun Sep 01 19:56:13 2019 +0200
@@ -34,7 +34,6 @@
     """ Tabnanny is used to check Python source files for correct""" \
     """ indentations."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginTranslator.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginTranslator.py	Sun Sep 01 19:56:13 2019 +0200
@@ -35,7 +35,6 @@
     """ various online translation services."""
 needsRestart = False
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVcsGit.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVcsGit.py	Sun Sep 01 19:56:13 2019 +0200
@@ -37,7 +37,6 @@
 longDescription = \
     """This plugin provides the Git version control interface."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVcsMercurial.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVcsMercurial.py	Sun Sep 01 19:56:13 2019 +0200
@@ -37,7 +37,6 @@
 longDescription = \
     """This plugin provides the Mercurial version control interface."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVcsPySvn.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVcsPySvn.py	Sun Sep 01 19:56:13 2019 +0200
@@ -35,7 +35,6 @@
 longDescription = \
     """This plugin provides the PySvn version control interface."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVcsSubversion.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVcsSubversion.py	Sun Sep 01 19:56:13 2019 +0200
@@ -37,7 +37,6 @@
 longDescription = \
     """This plugin provides the Subversion version control interface."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVmListspace.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVmListspace.py	Sun Sep 01 19:56:13 2019 +0200
@@ -30,7 +30,6 @@
 shortDescription = "Implements the Listspace view manager."
 longDescription = """This plugin provides the listspace view manager."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginVmTabview.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginVmTabview.py	Sun Sep 01 19:56:13 2019 +0200
@@ -30,7 +30,6 @@
 shortDescription = "Implements the Tabview view manager."
 longDescription = """This plugin provides the tabbed view view manager."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardDotDesktop.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardDotDesktop.py	Sun Sep 01 19:56:13 2019 +0200
@@ -32,7 +32,6 @@
     """ a .desktop file."""
 needsRestart = False
 pyqtApi = 2
-python2Compatible = True
 # End-of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardE5MessageBox.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardE5MessageBox.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the E5MessageBox wizard."
 longDescription = """This plugin shows the E5MessageBox wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardEricPlugin.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardEricPlugin.py	Sun Sep 01 19:56:13 2019 +0200
@@ -34,7 +34,6 @@
     """ an eric plug-in main script file."""
 needsRestart = False
 pyqtApi = 2
-python2Compatible = True
 # End-of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardPyRegExp.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardPyRegExp.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the Python re wizard."
 longDescription = """This plugin shows the Python re wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQColorDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQColorDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QColorDialog wizard."
 longDescription = """This plugin shows the QColorDialog wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQFileDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQFileDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -31,7 +31,6 @@
 shortDescription = "Show the QFileDialog wizard."
 longDescription = """This plugin shows the QFileDialog wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQFontDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQFontDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QFontDialog wizard."
 longDescription = """This plugin shows the QFontDialog wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQInputDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQInputDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QInputDialog wizard."
 longDescription = """This plugin shows the QInputDialog wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQMessageBox.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQMessageBox.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QMessageBox wizard."
 longDescription = """This plugin shows the QMessageBox wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQRegExp.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQRegExp.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QRegExp wizard."
 longDescription = """This plugin shows the QRegExp wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardQRegularExpression.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardQRegularExpression.py	Sun Sep 01 19:56:13 2019 +0200
@@ -29,7 +29,6 @@
 shortDescription = "Show the QRegularExpression wizard."
 longDescription = """This plugin shows the QRegularExpression wizard."""
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
--- a/eric6/Plugins/PluginWizardSetup.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/PluginWizardSetup.py	Sun Sep 01 19:56:13 2019 +0200
@@ -33,7 +33,6 @@
     """ variants."""
 needsRestart = False
 pyqtApi = 2
-python2Compatible = True
 # End-of-Header
 
 error = ""
--- a/eric6/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -130,7 +130,6 @@
             "shortDescription": self.shortDescriptionEdit.text(),
             "longDescription": self.longDescriptionEdit.toPlainText(),
             "needsRestart": self.restartCheckBox.isChecked(),
-            "python2Compatible": self.python2CheckBox.isChecked()
         }
         
         if self.configurationGroup.isChecked():
--- a/eric6/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sun Sep 01 19:56:13 2019 +0200
@@ -38,7 +38,6 @@
 )
 needsRestart = {needsRestart}
 pyqtApi = 2
-python2Compatible = {python2Compatible}
 # End-Of-Header
 
 error = ""
@@ -250,18 +249,13 @@
     @return list of API filenames
     @rtype list of str
     """
-    if language in ["Python3",  "Python2", "Python"]:
+    if language in ["Python3",  "Python"]:
         apisDir = \\
             os.path.join(os.path.dirname(__file__), "APIs", "Python")
         apis = glob.glob(os.path.join(apisDir, '*.api'))
-        if language == "Python3":
-            apisDir = \\
-                os.path.join(os.path.dirname(__file__), "APIs", "Python3")
-            apis.extend(glob.glob(os.path.join(apisDir, '*.api')))
-        else:
-            apisDir = \\
-                os.path.join(os.path.dirname(__file__), "APIs", "Python2")
-            apis.extend(glob.glob(os.path.join(apisDir, '*.api')))
+        apisDir = \\
+            os.path.join(os.path.dirname(__file__), "APIs", "Python3")
+        apis.extend(glob.glob(os.path.join(apisDir, '*.api')))
     else:
         apis = []
     return apis
--- a/eric6/Project/DebuggerPropertiesDialog.py	Sun Sep 01 19:40:53 2019 +0200
+++ b/eric6/Project/DebuggerPropertiesDialog.py	Sun Sep 01 19:56:13 2019 +0200
@@ -69,7 +69,7 @@
             venvIndex = max(0, self.venvComboBox.findText(
                 self.project.debugProperties["VIRTUALENV"]))
         else:
-            if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2"]:
+            if self.project.pdata["PROGLANGUAGE"] == "Python2":
                 venvName = Preferences.getDebugger("Python2VirtualEnv")
             elif self.project.pdata["PROGLANGUAGE"] == "Python3":
                 venvName = Preferences.getDebugger("Python3VirtualEnv")

eric ide

mercurial