Mercurial Repositories > eric / changeset

--- a/Graphics/ApplicationDiagram.py	Tue Jul 27 09:26:24 2010 +0200
+++ b/Graphics/ApplicationDiagram.py	Tue Jul 27 12:33:08 2010 +0200
@@ -116,18 +116,18 @@
                     impLst.append(i)
                 else:
                     if i.find('.') == -1:
-                        n = "%s.%s" % (modules[module].package, i)
+                        n = "{0}.{1}".format(modules[module].package, i)
                         if n in modules:
                             impLst.append(n)
                         else:
-                            n = "%s.%s" % (project, i)
+                            n = "{0}.{1}".format(project, i)
                             if n in modules:
                                 impLst.append(n)
                             elif n in packages:
-                                n = "%s.<<Dummy>>" % n
+                                n = "{0}.<<Dummy>>".format(n)
                                 impLst.append(n)
                     else:
-                        n = "%s.%s" % (project, i)
+                        n = "{0}.{1}".format(project, i)
                         if n in modules:
                             impLst.append(n)
             for i in list(modules[module].from_imports.keys()):
@@ -153,18 +153,18 @@
                     impLst.append(i)
                 else:
                     if i.find('.') == -1:
-                        n = "%s.%s" % (modules[module].package, i)
+                        n = "{0}.{1}".format(modules[module].package, i)
                         if n in modules:
                             impLst.append(n)
                         else:
-                            n = "%s.%s" % (project, i)
+                            n = "{0}.{1}".format(project, i)
                             if n in modules:
                                 impLst.append(n)
                             elif n in packages:
-                                n = "%s.<<Dummy>>" % n
+                                n = "{0}.<<Dummy>>".format(n)
                                 impLst.append(n)
                     else:
-                        n = "%s.%s" % (project, i)
+                        n = "{0}.{1}".format(project, i)
                         if n in modules:
                             impLst.append(n)
             for imp in impLst:

--- a/Graphics/ImportsDiagram.py	Tue Jul 27 09:26:24 2010 +0200
+++ b/Graphics/ImportsDiagram.py	Tue Jul 27 12:33:08 2010 +0200
@@ -69,7 +69,7 @@
         for ext in Preferences.getPython("PythonExtensions") + \
                     Preferences.getPython("Python3Extensions"):
             modules.extend(
-                glob.glob(Utilities.normjoinpath(self.packagePath, '*%s' % ext)))
+                glob.glob(Utilities.normjoinpath(self.packagePath, '*{0}'.format(ext))))
         
         tot = len(modules)
         try:

--- a/Graphics/PackageDiagram.py	Tue Jul 27 09:26:24 2010 +0200
+++ b/Graphics/PackageDiagram.py	Tue Jul 27 12:33:08 2010 +0200
@@ -65,8 +65,8 @@
         @return dictionary of modules contained in the package.
         """
         supportedExt = \
-            ['*%s' % ext for ext in Preferences.getPython("PythonExtensions")] + \
-            ['*%s' % ext for ext in Preferences.getPython("Python3Extensions")] + \
+            ['*{0}'.format(ext) for ext in Preferences.getPython("PythonExtensions")] + \
+            ['*{0}'.format(ext) for ext in Preferences.getPython("Python3Extensions")] + \
             ['*.rb']
         
         moduleDict = {}
@@ -262,7 +262,7 @@
         attrs = sorted(_class.attributes.keys())
         name = _class.name
         if isRbModule:
-            name = "%s (Module)" % name
+            name = "{0} (Module)".format(name)
         cl = ClassModel(name, meths[:], attrs[:])
         cw = ClassItem(cl, False, x, y, noAttrs = self.noAttrs, scene = self.scene)
         self.allClasses[className] = cw

--- a/Graphics/UMLClassDiagram.py	Tue Jul 27 09:26:24 2010 +0200
+++ b/Graphics/UMLClassDiagram.py	Tue Jul 27 12:33:08 2010 +0200
@@ -211,7 +211,7 @@
         attrs = sorted(_class.attributes.keys())
         name = _class.name
         if isRbModule:
-            name = "%s (Module)" % name
+            name = "{0} (Module)".format(name)
         cl = ClassModel(name, meths[:], attrs[:])
         cw = ClassItem(cl, False, x, y, noAttrs = self.noAttrs, scene = self.scene)
         self.allClasses[className] = cw