Thu, 10 Oct 2013 18:40:16 +0200
Continued to shorten the code lines to max. 79 characters.
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Thu Oct 10 18:35:45 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Thu Oct 10 18:40:16 2013 +0200 @@ -130,7 +130,9 @@ """ act = self.actionAt(pos) - if act is not None and act.menu() is None and self.index(act).isValid(): + if act is not None and \ + act.menu() is None and \ + self.index(act).isValid(): menu = QMenu() v = act.data()
--- a/Helpviewer/SpeedDial/SpeedDial.py Thu Oct 10 18:35:45 2013 +0200 +++ b/Helpviewer/SpeedDial/SpeedDial.py Thu Oct 10 18:40:16 2013 +0200 @@ -129,8 +129,9 @@ else: imgSource = QUrl.fromLocalFile(imgSource).toString() - self.__initialScript += "addBox('{0}', '{1}', '{2}');\n".format( - page.url, page.title, imgSource) + self.__initialScript += \ + "addBox('{0}', '{1}', '{2}');\n".format( + page.url, page.title, imgSource) return self.__initialScript
--- a/install.py Thu Oct 10 18:35:45 2013 +0200 +++ b/install.py Thu Oct 10 18:40:16 2013 +0200 @@ -387,10 +387,10 @@ os.remove(f) # Cleanup the install directories - for name in ['ericExamplesDir', 'ericDocDir', 'ericDTDDir', 'ericCSSDir', - 'ericIconDir', 'ericPixDir', 'ericTemplatesDir', - 'ericCodeTemplatesDir', 'ericOthersDir', 'ericStylesDir', - 'ericDir']: + for name in ['ericExamplesDir', 'ericDocDir', 'ericDTDDir', + 'ericCSSDir', 'ericIconDir', 'ericPixDir', + 'ericTemplatesDir', 'ericCodeTemplatesDir', + 'ericOthersDir', 'ericStylesDir', 'ericDir']: if os.path.exists(getConfig(name)): shutil.rmtree(getConfig(name), True) @@ -496,7 +496,8 @@ shutilCopy(configName + 'c', modDir) # copy the various parts of eric5 - copyTree(sourceDir, cfg['ericDir'], ['*.py', '*.pyc', '*.pyo', '*.pyw'], + copyTree(sourceDir, cfg['ericDir'], + ['*.py', '*.pyc', '*.pyo', '*.pyw'], ['{1}{0}Examples'.format(os.sep, sourceDir)], excludePatterns=["eric5config.py*"]) copyTree(sourceDir, cfg['ericDir'], ['*.rb'],