Mercurial Repositories > Eric Assistant / file diff

--- a/AssistantEric/APIsManager.py	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/APIsManager.py	Mon Jun 22 19:16:15 2020 +0200
@@ -11,8 +11,9 @@
 
 import os
 
-from PyQt5.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, \
-    QObject, Qt
+from PyQt5.QtCore import (
+    QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, QObject, Qt
+)
 try:
     from PyQt5.QtSql import QSqlDatabase, QSqlQuery
 except ImportError:
@@ -174,8 +175,10 @@
         finally:
             db.commit()
         if self.__projectPath:
-            modTime = QFileInfo(os.path.join(self.__projectPath, apiFile))\
+            modTime = (
+                QFileInfo(os.path.join(self.__projectPath, apiFile))
                 .lastModified()
+            )
         else:
             modTime = QFileInfo(apiFile).lastModified()
             basesFile = os.path.splitext(apiFile)[0] + ".bas"
@@ -255,8 +258,10 @@
             try:
                 basesFile = os.path.splitext(apiFile)[0] + ".bas"
                 if os.path.exists(basesFile):
-                    bases = Utilities.readEncodedFile(basesFile)[0]\
+                    bases = (
+                        Utilities.readEncodedFile(basesFile)[0]
                         .splitlines(True)
+                    )
             except (IOError, UnicodeError):
                 pass
             language = None
@@ -578,8 +583,9 @@
     create_context_idx = """CREATE INDEX context_idx on api (context)"""
     drop_context_idx = """DROP INDEX IF EXISTS context_idx"""
     
-    create_fullContext_idx = \
+    create_fullContext_idx = (
         """CREATE INDEX fullContext_idx on api (fullContext)"""
+    )
     drop_fullContext_idx = """DROP INDEX IF EXISTS fullContext_idx"""
     
     create_bases_idx = """CREATE INDEX base_idx on bases (class)"""
@@ -688,7 +694,7 @@
         """
         Private method to initialize as a language API object.
         """
-        if self.__language in ["Python", "Python2", "Python3"]:
+        if self.__language == "Python3":
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
@@ -732,8 +738,10 @@
             self.__worker.abort()
             if self.__worker is not None:
                 self.__worker.wait(5000)
-                if self.__worker is not None and \
-                   not self.__worker.isFinished():
+                if (
+                    self.__worker is not None and
+                    not self.__worker.isFinished()
+                ):
                     self.__worker.terminate()
                     if self.__worker is not None:
                         self.__worker.wait(5000)
@@ -755,9 +763,10 @@
             # the database connection is a new one
             db = QSqlDatabase.addDatabase("QSQLITE", self.__connectionName)
             dbName = self._apiDbName()
-            if self.__language == ApisNameProject and \
-                    not os.path.exists(
-                        self.__project.getProjectManagementDir()):
+            if (
+                self.__language == ApisNameProject and
+                not os.path.exists(self.__project.getProjectManagementDir())
+            ):
                 opened = False
             else:
                 db.setDatabaseName(dbName)
@@ -1036,8 +1045,7 @@
             (boolean)
         @return list of project form sources (list of strings)
         """
-        if self.__project.getProjectLanguage() in ["Python", "Python2",
-                                                   "Python3"]:
+        if self.__project.getProjectLanguage() == "Python3":
             sourceExt = ".py"
         elif self.__project.getProjectLanguage() == "Ruby":
             sourceExt = ".rb"
@@ -1170,8 +1178,7 @@
         """
         Private slot to perform actions after a project has been opened.
         """
-        if self.__project.getProjectLanguage() in ["Python", "Python2",
-                                                   "Python3"]:
+        if self.__project.getProjectLanguage() == "Python3":
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
@@ -1258,8 +1265,10 @@
         try:
             return self.__apis[(language, projectType)]
         except KeyError:
-            if language in self.__supportedApiLanguages() or \
-               language == ApisNameProject:
+            if (
+                language in self.__supportedApiLanguages() or
+                language == ApisNameProject
+            ):
                 # create the api object
                 api = DbAPIs(language, projectType=projectType)
                 api.apiPreparationStatus.connect(self.__apiPreparationStatus)
@@ -1328,3 +1337,6 @@
         elif status == WorkerStatusAborted:
             self.__showMessage(self.tr(
                 "Preparation of '{0}' APIs cancelled.").format(language))
+
+#
+# eflag: noqa = M523, M834, S608