diff -r 0a02c433f52d -r 5883ce99ee12 Project/ProjectSourcesBrowser.py --- a/Project/ProjectSourcesBrowser.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Project/ProjectSourcesBrowser.py Sun Nov 03 15:58:22 2013 +0100 @@ -82,14 +82,14 @@ """ Private method to close all project related windows. """ - self.codemetrics and self.codemetrics.close() - self.codecoverage and self.codecoverage.close() - self.profiledata and self.profiledata.close() - self.classDiagram and self.classDiagram.close() - self.importsDiagram and self.importsDiagram.close() - self.packageDiagram and self.packageDiagram.close() + self.codemetrics and self.codemetrics.close() + self.codecoverage and self.codecoverage.close() + self.profiledata and self.profiledata.close() + self.classDiagram and self.classDiagram.close() + self.importsDiagram and self.importsDiagram.close() + self.packageDiagram and self.packageDiagram.close() self.applicationDiagram and self.applicationDiagram.close() - self.loadedDiagram and self.loadedDiagram.close() + self.loadedDiagram and self.loadedDiagram.close() def _projectClosed(self): """ @@ -106,7 +106,7 @@ self.sourceMenuActions = {} if self.project.pdata["PROGLANGUAGE"][0] in \ - ["Python", "Python2", "Python3"]: + ["Python", "Python2", "Python3"]: self.__createPythonPopupMenus() elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": self.__createRubyPopupMenus() @@ -462,8 +462,8 @@ bfcnt = categories[str(ProjectBrowserFileItem)] cmcnt = categories[str(BrowserClassItem)] + \ - categories[str(BrowserMethodItem)] + \ - categories[str(BrowserClassAttributeItem)] + categories[str(BrowserMethodItem)] + \ + categories[str(BrowserClassAttributeItem)] sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)] if cnt > 1 and cnt == bfcnt: self.multiMenu.popup(self.mapToGlobal(coord)) @@ -579,8 +579,8 @@ prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) - coEnable = (coEnable or \ - os.path.isfile("{0}.coverage".format(basename)) or \ + coEnable = (coEnable or + os.path.isfile("{0}.coverage".format(basename)) or os.path.isfile("{0}.coverage".format(tbasename))) and \ self.project.isPy3Project() @@ -591,7 +591,7 @@ basename = os.path.splitext(fn)[0] prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) - coEnable = (coEnable or \ + coEnable = (coEnable or os.path.isfile("{0}.coverage".format(basename))) and \ itm.isPython3File() @@ -642,7 +642,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = "" @@ -669,8 +669,8 @@ self.trUtf8( """<p>The package directory <b>{0}</b> could""" """ not be created. Aborting...</p>""" - """<p>Reason: {1}</p>""")\ - .format(packagePath, str(err))) + """<p>Reason: {1}</p>""") + .format(packagePath, str(err))) return packageFile = os.path.join(packagePath, "__init__.py") if not os.path.exists(packageFile): @@ -684,8 +684,8 @@ self.trUtf8( """<p>The package file <b>{0}</b> could""" """ not be created. Aborting...</p>""" - """<p>Reason: {1}</p>""")\ - .format(packageFile, str(err))) + """<p>Reason: {1}</p>""") + .format(packageFile, str(err))) return self.project.appendFile(packageFile) if packageFile: @@ -701,7 +701,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None @@ -717,7 +717,7 @@ isinstance(itm, BrowserMethodItem): dn = os.path.dirname(itm.fileName()) elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \ - isinstance(itm, ProjectBrowserDirectoryItem): + isinstance(itm, ProjectBrowserDirectoryItem): dn = itm.dirName() else: dn = None