Mercurial Repositories > Eric Assistant / file diff

diff -r 08cb4f36ad47 -r 5cfe53b474a9 AssistantEric/APIsManager.py
--- a/AssistantEric/APIsManager.py	Sat Dec 31 13:50:18 2016 +0100
+++ b/AssistantEric/APIsManager.py	Mon Mar 27 19:27:58 2017 +0200
@@ -192,13 +192,13 @@
                 if not _class.attributes[variable].isPrivate():
                     from QScintilla.Editor import Editor
                     if _class.attributes[variable].isPublic():
-                        id = Editor.AttributeID
+                        iconId = Editor.AttributeID
                     elif _class.attributes[variable].isProtected():
-                        id = Editor.AttributeProtectedID
+                        iconId = Editor.AttributeProtectedID
                     else:
-                        id = Editor.AttributePrivateID
+                        iconId = Editor.AttributePrivateID
                     api.append('{0}{1}?{2:d}'.format(classNameStr, variable,
-                                                     id))
+                                                     iconId))
         return api
     
     def __loadApiFile(self, apiFile):
@@ -315,15 +315,15 @@
                 return
             if not query.next():
                 return
-            id = int(query.value(0))
+            fileId = int(query.value(0))
             
             # step 2: delete all entries belonging to this file
             query.prepare(self.populate_del_api_stmt)
-            query.bindValue(":fileId", id)
+            query.bindValue(":fileId", fileId)
             query.exec_()
             
             query.prepare(self.populate_del_bases_stmt)
-            query.bindValue(":fileId", id)
+            query.bindValue(":fileId", fileId)
             query.exec_()
             
             # step 3: load the given API info
@@ -383,7 +383,7 @@
                     query.bindValue(":context", context)
                     query.bindValue(":fullContext", fullContext)
                     query.bindValue(":signature", sig)
-                    query.bindValue(":fileId", id)
+                    query.bindValue(":fileId", fileId)
                     query.bindValue(":pictureId", pictureId)
                     query.exec_()
                     
@@ -402,7 +402,7 @@
                 class_, baseClasses = base.split(" ", 1)
                 query.bindValue(":class", class_)
                 query.bindValue(":baseClasses", baseClasses)
-                query.bindValue(":fileId", id)
+                query.bindValue(":fileId", fileId)
                 query.exec_()
             
             if not self.__aborted:
@@ -434,21 +434,21 @@
             query.bindValue(":file", apiFile)
             query.exec_()
             query.next()
-            id = int(query.value(0))
+            fileId = int(query.value(0))
             
             # step 2: delete all API entries belonging to this file
             query.prepare(self.populate_del_api_stmt)
-            query.bindValue(":fileId", id)
+            query.bindValue(":fileId", fileId)
             query.exec_()
             
             # step 3: delete all base classes entries belonging to this file
             query.prepare(self.populate_del_bases_stmt)
-            query.bindValue(":fileId", id)
+            query.bindValue(":fileId", fileId)
             query.exec_()
             
             # step 4: delete the file entry
             query.prepare(self.file_delete_id_stmt)
-            query.bindValue(":id", id)
+            query.bindValue(":id", fileId)
             query.exec_()
         finally:
             del query
@@ -797,8 +797,8 @@
                 ok = query.exec_(self.format_select_stmt)
                 if ok:
                     query.next()
-                    format = int(query.value(0))
-                    if format >= self.DB_VERSION:
+                    formatVersion = int(query.value(0))
+                    if formatVersion >= self.DB_VERSION:
                         prepared = True
             finally:
                 del query