Mercurial Repositories > eric / file diff

--- a/DocumentationTools/APIGenerator.py	Tue Mar 07 18:46:09 2017 +0100
+++ b/DocumentationTools/APIGenerator.py	Tue Mar 07 18:53:18 2017 +0100
@@ -87,13 +87,13 @@
         for globalName in sorted(self.module.globals.keys()):
             if not self.__isPrivate(self.module.globals[globalName]):
                 if self.module.globals[globalName].isPublic():
-                    id = Editor.AttributeID
+                    iconId = Editor.AttributeID
                 elif self.module.globals[globalName].isProtected():
-                    id = Editor.AttributeProtectedID
+                    iconId = Editor.AttributeProtectedID
                 else:
-                    id = Editor.AttributePrivateID
+                    iconId = Editor.AttributePrivateID
                 self.api.append("{0}{1}?{2:d}".format(
-                    moduleNameStr, globalName, id))
+                    moduleNameStr, globalName, iconId))
         
     def __addClassesAPI(self):
         """
@@ -118,28 +118,28 @@
         if '__init__' in methods:
             methods.remove('__init__')
             if _class.isPublic():
-                id = Editor.ClassID
+                iconId = Editor.ClassID
             elif _class.isProtected():
-                id = Editor.ClassProtectedID
+                iconId = Editor.ClassProtectedID
             else:
-                id = Editor.ClassPrivateID
+                iconId = Editor.ClassPrivateID
             self.api.append(
                 '{0}{1}?{2:d}({3})'.format(
-                    self.moduleName, _class.name, id,
+                    self.moduleName, _class.name, iconId,
                     ', '.join(_class.methods['__init__'].parameters[1:])))
             
         classNameStr = "{0}{1}.".format(self.moduleName, className)
         for method in methods:
             if not self.__isPrivate(_class.methods[method]):
                 if _class.methods[method].isPublic():
-                    id = Editor.MethodID
+                    iconId = Editor.MethodID
                 elif _class.methods[method].isProtected():
-                    id = Editor.MethodProtectedID
+                    iconId = Editor.MethodProtectedID
                 else:
-                    id = Editor.MethodPrivateID
+                    iconId = Editor.MethodPrivateID
                 self.api.append(
                     '{0}{1}?{2:d}({3})'.format(
-                        classNameStr, method, id,
+                        classNameStr, method, iconId,
                         ', '.join(_class.methods[method].parameters[1:])))
         
     def __addClassVariablesAPI(self, className):
@@ -156,13 +156,13 @@
         for variable in sorted(_class.globals.keys()):
             if not self.__isPrivate(_class.globals[variable]):
                 if _class.globals[variable].isPublic():
-                    id = Editor.AttributeID
+                    iconId = Editor.AttributeID
                 elif _class.globals[variable].isProtected():
-                    id = Editor.AttributeProtectedID
+                    iconId = Editor.AttributeProtectedID
                 else:
-                    id = Editor.AttributePrivateID
+                    iconId = Editor.AttributePrivateID
                 self.api.append('{0}{1}?{2:d}'.format(
-                    classNameStr, variable, id))
+                    classNameStr, variable, iconId))
         
     def __addFunctionsAPI(self):
         """
@@ -174,13 +174,13 @@
         for funcName in funcNames:
             if not self.__isPrivate(self.module.functions[funcName]):
                 if self.module.functions[funcName].isPublic():
-                    id = Editor.MethodID
+                    iconId = Editor.MethodID
                 elif self.module.functions[funcName].isProtected():
-                    id = Editor.MethodProtectedID
+                    iconId = Editor.MethodProtectedID
                 else:
-                    id = Editor.MethodPrivateID
+                    iconId = Editor.MethodPrivateID
                 self.api.append(
                     '{0}{1}?{2:d}({3})'.format(
                         self.moduleName, self.module.functions[funcName].name,
-                        id,
+                        iconId,
                         ', '.join(self.module.functions[funcName].parameters)))