Mercurial Repositories > eric / file comparison
comparison: UI/BrowserModel.py
UI/BrowserModel.py
- changeset 432
- 497e188ee86e
- parent 405
- 374066392929
- child 564
- b3d966393ba9
equal
deleted
inserted
replaced
| 431:96cc7d322f89 | 432:497e188ee86e |
|---|---|
| 1195 supers = [] | 1195 supers = [] |
| 1196 for sup in cl.super: | 1196 for sup in cl.super: |
| 1197 try: | 1197 try: |
| 1198 sname = sup.name | 1198 sname = sup.name |
| 1199 if sup.module != cl.module: | 1199 if sup.module != cl.module: |
| 1200 sname = "%s.%s" % (sup.module, sname) | 1200 sname = "{0}.{1}".format(sup.module, sname) |
| 1201 except AttributeError: | 1201 except AttributeError: |
| 1202 sname = sup | 1202 sname = sup |
| 1203 supers.append(sname) | 1203 supers.append(sname) |
| 1204 name = name + "(%s)" % ", ".join(supers) | 1204 name = name + "({0})".format(", ".join(supers)) |
| 1205 | 1205 |
| 1206 BrowserItem.__init__(self, parent, name) | 1206 BrowserItem.__init__(self, parent, name) |
| 1207 | 1207 |
| 1208 self.type_ = BrowserItemClass | 1208 self.type_ = BrowserItemClass |
| 1209 self.name = name | 1209 self.name = name |
| 1219 self.icon = UI.PixmapCache.getIcon("method_private.png") | 1219 self.icon = UI.PixmapCache.getIcon("method_private.png") |
| 1220 elif cl.isProtected(): | 1220 elif cl.isProtected(): |
| 1221 self.icon = UI.PixmapCache.getIcon("method_protected.png") | 1221 self.icon = UI.PixmapCache.getIcon("method_protected.png") |
| 1222 else: | 1222 else: |
| 1223 self.icon = UI.PixmapCache.getIcon("method.png") | 1223 self.icon = UI.PixmapCache.getIcon("method.png") |
| 1224 self.itemData[0] = "%s(%s)" % (name, ", ".join(self._classObject.parameters)) | 1224 self.itemData[0] = "{0}({1})".format( |
| 1225 name, ", ".join(self._classObject.parameters)) | |
| 1225 # if no defaults are wanted | 1226 # if no defaults are wanted |
| 1226 # ... % (name, ", ".join([e.split('=')[0].strip() \ | 1227 # ....format(name, ", ".join([e.split('=')[0].strip() \ |
| 1227 # for e in self._classObject.parameters])) | 1228 # for e in self._classObject.parameters])) |
| 1228 elif self.ismodule: | 1229 elif self.ismodule: |
| 1229 self.icon = UI.PixmapCache.getIcon("module.png") | 1230 self.icon = UI.PixmapCache.getIcon("module.png") |
| 1230 else: | 1231 else: |
| 1231 if cl.isPrivate(): | 1232 if cl.isPrivate(): |
| 1232 self.icon = UI.PixmapCache.getIcon("class_private.png") | 1233 self.icon = UI.PixmapCache.getIcon("class_private.png") |
| 1317 self.icon = UI.PixmapCache.getIcon("method_private.png") | 1318 self.icon = UI.PixmapCache.getIcon("method_private.png") |
| 1318 elif self._functionObject.isProtected(): | 1319 elif self._functionObject.isProtected(): |
| 1319 self.icon = UI.PixmapCache.getIcon("method_protected.png") | 1320 self.icon = UI.PixmapCache.getIcon("method_protected.png") |
| 1320 else: | 1321 else: |
| 1321 self.icon = UI.PixmapCache.getIcon("method.png") | 1322 self.icon = UI.PixmapCache.getIcon("method.png") |
| 1322 self.itemData[0] = "%s(%s)" % \ | 1323 self.itemData[0] = "{0}({1})".format( |
| 1323 (name, ", ".join(self._functionObject.parameters)) | 1324 name, ", ".join(self._functionObject.parameters)) |
| 1324 # if no defaults are wanted | 1325 # if no defaults are wanted |
| 1325 # ... % (name, ", ".join(\ | 1326 # ....format(name, ", ".join(\ |
| 1326 # [e.split('=')[0].strip() for e in self._functionObject.parameters])) | 1327 # [e.split('=')[0].strip() for e in self._functionObject.parameters])) |
| 1327 if self._functionObject and \ | 1328 if self._functionObject and \ |
| 1328 (self._functionObject.methods or self._functionObject.classes): | 1329 (self._functionObject.methods or self._functionObject.classes): |
| 1329 self._populated = False | 1330 self._populated = False |
| 1330 self._lazyPopulation = True | 1331 self._lazyPopulation = True |
| 1331 | 1332 |
