Mercurial Repositories > eric / changeset
changeset
Removed some code complexity issues detected by the new complexity checker.
Sat, 25 Mar 2017 20:05:18 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 25 Mar 2017 20:05:18 +0100
- changeset 5664
- 9b318fcb1ee2
- parent 5663
- 52a91f9a7a76
- child 5665
- 0672146bad2a
Removed some code complexity issues detected by the new complexity checker.
--- a/Helpviewer/Network/EricAccessHandler.py Sat Mar 25 17:38:02 2017 +0100 +++ b/Helpviewer/Network/EricAccessHandler.py Sat Mar 25 20:05:18 2017 +0100 @@ -76,42 +76,43 @@ htmlFile.open(QFile.ReadOnly) html = bytes(htmlFile.readAll()).decode() - html = ( - html.replace("@FAVICON@", "qrc:icons/ericWeb16.png") - .replace("@IMG_PLUS@", "qrc:icons/plus.png") - .replace("@IMG_CLOSE@", "qrc:icons/close.png") - .replace("@IMG_EDIT@", "qrc:icons/edit.png") - .replace("@IMG_RELOAD@", "qrc:icons/reload.png") - .replace("@IMG_SETTINGS@", "qrc:icons/setting.png") - .replace("@LOADING-IMG@", "qrc:icons/loading.gif") - .replace("@BOX-BORDER@", "qrc:icons/box-border-small.png") - - .replace("@JQUERY@", "qrc:javascript/jquery.js") - .replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js") - - .replace("@SITE-TITLE@", self.tr("Speed Dial")) - .replace("@URL@", self.tr("URL")) - .replace("@TITLE@", self.tr("Title")) - .replace("@APPLY@", self.tr("Apply")) - .replace("@CLOSE@", self.tr("Close")) - .replace("@NEW-PAGE@", self.tr("New Page")) - .replace("@TITLE-EDIT@", self.tr("Edit")) - .replace("@TITLE-REMOVE@", self.tr("Remove")) - .replace("@TITLE-RELOAD@", self.tr("Reload")) - .replace("@TITLE-WARN@", - self.tr("Are you sure to remove this speed dial?")) - .replace("@TITLE-WARN-REL@", - self.tr("Are you sure you want to reload all speed" - " dials?")) - .replace("@TITLE-FETCHTITLE@", - self.tr("Load title from page")) - .replace("@SETTINGS-TITLE@", - self.tr("Speed Dial Settings")) - .replace("@ADD-TITLE@", self.tr("Add New Page")) - .replace("@TXT_NRROWS@", - self.tr("Maximum pages in a row:")) - .replace("@TXT_SDSIZE@", self.tr("Change size of pages:")) - ) + html = html.replace("@FAVICON@", "qrc:icons/ericWeb16.png") + html = html.replace("@IMG_PLUS@", "qrc:icons/plus.png") + html = html.replace("@IMG_CLOSE@", "qrc:icons/close.png") + html = html.replace("@IMG_EDIT@", "qrc:icons/edit.png") + html = html.replace("@IMG_RELOAD@", "qrc:icons/reload.png") + html = html.replace("@IMG_SETTINGS@", "qrc:icons/setting.png") + html = html.replace("@LOADING-IMG@", "qrc:icons/loading.gif") + html = html.replace("@BOX-BORDER@", + "qrc:icons/box-border-small.png") + + html = html.replace("@JQUERY@", "qrc:javascript/jquery.js") + html = html.replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js") + + html = html.replace("@SITE-TITLE@", self.tr("Speed Dial")) + html = html.replace("@URL@", self.tr("URL")) + html = html.replace("@TITLE@", self.tr("Title")) + html = html.replace("@APPLY@", self.tr("Apply")) + html = html.replace("@CLOSE@", self.tr("Close")) + html = html.replace("@NEW-PAGE@", self.tr("New Page")) + html = html.replace("@TITLE-EDIT@", self.tr("Edit")) + html = html.replace("@TITLE-REMOVE@", self.tr("Remove")) + html = html.replace("@TITLE-RELOAD@", self.tr("Reload")) + html = html.replace("@TITLE-WARN@", + self.tr("Are you sure to remove this" + " speed dial?")) + html = html.replace("@TITLE-WARN-REL@", + self.tr("Are you sure you want to reload" + " all speed dials?")) + html = html.replace("@TITLE-FETCHTITLE@", + self.tr("Load title from page")) + html = html.replace("@SETTINGS-TITLE@", + self.tr("Speed Dial Settings")) + html = html.replace("@ADD-TITLE@", self.tr("Add New Page")) + html = html.replace("@TXT_NRROWS@", + self.tr("Maximum pages in a row:")) + html = html.replace("@TXT_SDSIZE@", + self.tr("Change size of pages:")) self._speedDialPage = Utilities.html_uencode(html)
--- a/IconEditor/IconEditorGrid.py Sat Mar 25 17:38:02 2017 +0100 +++ b/IconEditor/IconEditorGrid.py Sat Mar 25 20:05:18 2017 +0100 @@ -671,7 +671,9 @@ elif self.__curTool in [self.Circle, self.FilledCircle, self.CircleSelection]: - r = max(abs(start.x() - end.x()), abs(start.y() - end.y())) + deltaX = abs(start.x() - end.x()) + deltaY = abs(start.y() - end.y()) + r = max(deltaX, deltaY) if self.__curTool in [self.FilledCircle, self.CircleSelection]: painter.setBrush(QBrush(drawColor)) painter.drawEllipse(start, r, r)
--- a/Snapshot/SnapshotRegionGrabber.py Sat Mar 25 17:38:02 2017 +0100 +++ b/Snapshot/SnapshotRegionGrabber.py Sat Mar 25 20:05:18 2017 +0100 @@ -414,8 +414,10 @@ self.__BLHandle.moveBottomLeft(r.bottomLeft()) self.__BRHandle.moveBottomRight(r.bottomRight()) - self.__LHandle.moveTopLeft(QPoint(r.x(), r.y() + r.height() // 2 - s2)) - self.__THandle.moveTopLeft(QPoint(r.x() + r.width() // 2 - s2, r.y())) + self.__LHandle.moveTopLeft( + QPoint(r.x(), r.y() + r.height() // 2 - s2)) + self.__THandle.moveTopLeft( + QPoint(r.x() + r.width() // 2 - s2, r.y())) self.__RHandle.moveTopRight( QPoint(r.right(), r.y() + r.height() // 2 - s2)) self.__BHandle.moveBottomLeft(
--- a/UI/DiffDialog.py Sat Mar 25 17:38:02 2017 +0100 +++ b/UI/DiffDialog.py Sat Mar 25 20:05:18 2017 +0100 @@ -90,7 +90,10 @@ yield '--- {0}\t{1}{2}'.format(fromfile, fromfiledate, lineterm) yield '+++ {0}\t{1}{2}'.format(tofile, tofiledate, lineterm) started = True - i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4] + i1 = group[0][1] + i2 = group[-1][2] + j1 = group[0][3] + j2 = group[-1][4] yield "@@ -{0:d},{1:d} +{2:d},{3:d} @@{4}".format( i1 + 1, i2 - i1, j1 + 1, j2 - j1, lineterm) for tag, i1, i2, j1, j2 in group:
--- a/Utilities/crypto/py3AES.py Sat Mar 25 17:38:02 2017 +0100 +++ b/Utilities/crypto/py3AES.py Sat Mar 25 20:05:18 2017 +0100 @@ -393,14 +393,22 @@ cpy = column[:] g = self.__galois_multiplication - column[0] = g(cpy[0], mult[0]) ^ g(cpy[3], mult[1]) ^ \ + column[0] = ( + g(cpy[0], mult[0]) ^ g(cpy[3], mult[1]) ^ g(cpy[2], mult[2]) ^ g(cpy[1], mult[3]) - column[1] = g(cpy[1], mult[0]) ^ g(cpy[0], mult[1]) ^ \ + ) + column[1] = ( + g(cpy[1], mult[0]) ^ g(cpy[0], mult[1]) ^ g(cpy[3], mult[2]) ^ g(cpy[2], mult[3]) - column[2] = g(cpy[2], mult[0]) ^ g(cpy[1], mult[1]) ^ \ + ) + column[2] = ( + g(cpy[2], mult[0]) ^ g(cpy[1], mult[1]) ^ g(cpy[0], mult[2]) ^ g(cpy[3], mult[3]) - column[3] = g(cpy[3], mult[0]) ^ g(cpy[2], mult[1]) ^ \ + ) + column[3] = ( + g(cpy[3], mult[0]) ^ g(cpy[2], mult[1]) ^ g(cpy[1], mult[2]) ^ g(cpy[0], mult[3]) + ) return column def __aes_round(self, state, roundKey):
--- a/WebBrowser/Network/EricSchemeHandler.py Sat Mar 25 17:38:02 2017 +0100 +++ b/WebBrowser/Network/EricSchemeHandler.py Sat Mar 25 20:05:18 2017 +0100 @@ -196,42 +196,43 @@ """ if not self._speedDialPage: page = readAllFileContents(":/html/speeddialPage.html") - page = ( - page.replace("@FAVICON@", "qrc:icons/ericWeb16.png") - .replace("@IMG_PLUS@", "qrc:icons/plus.png") - .replace("@IMG_CLOSE@", "qrc:icons/close.png") - .replace("@IMG_EDIT@", "qrc:icons/edit.png") - .replace("@IMG_RELOAD@", "qrc:icons/reload.png") - .replace("@IMG_SETTINGS@", "qrc:icons/setting.png") - .replace("@LOADING-IMG@", "qrc:icons/loading.gif") - .replace("@BOX-BORDER@", "qrc:icons/box-border-small.png") - - .replace("@JQUERY@", "qrc:javascript/jquery.js") - .replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js") - - .replace("@SITE-TITLE@", self.tr("Speed Dial")) - .replace("@URL@", self.tr("URL")) - .replace("@TITLE@", self.tr("Title")) - .replace("@APPLY@", self.tr("Apply")) - .replace("@CLOSE@", self.tr("Close")) - .replace("@NEW-PAGE@", self.tr("New Page")) - .replace("@TITLE-EDIT@", self.tr("Edit")) - .replace("@TITLE-REMOVE@", self.tr("Remove")) - .replace("@TITLE-RELOAD@", self.tr("Reload")) - .replace("@TITLE-WARN@", - self.tr("Are you sure to remove this speed dial?")) - .replace("@TITLE-WARN-REL@", - self.tr("Are you sure you want to reload all speed" - " dials?")) - .replace("@TITLE-FETCHTITLE@", - self.tr("Load title from page")) - .replace("@SETTINGS-TITLE@", - self.tr("Speed Dial Settings")) - .replace("@ADD-TITLE@", self.tr("Add New Page")) - .replace("@TXT_NRROWS@", - self.tr("Maximum pages in a row:")) - .replace("@TXT_SDSIZE@", self.tr("Change size of pages:")) - ) + page = page.replace("@FAVICON@", "qrc:icons/ericWeb16.png") + page = page.replace("@IMG_PLUS@", "qrc:icons/plus.png") + page = page.replace("@IMG_CLOSE@", "qrc:icons/close.png") + page = page.replace("@IMG_EDIT@", "qrc:icons/edit.png") + page = page.replace("@IMG_RELOAD@", "qrc:icons/reload.png") + page = page.replace("@IMG_SETTINGS@", "qrc:icons/setting.png") + page = page.replace("@LOADING-IMG@", "qrc:icons/loading.gif") + page = page.replace("@BOX-BORDER@", + "qrc:icons/box-border-small.png") + + page = page.replace("@JQUERY@", "qrc:javascript/jquery.js") + page = page.replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js") + + page = page.replace("@SITE-TITLE@", self.tr("Speed Dial")) + page = page.replace("@URL@", self.tr("URL")) + page = page.replace("@TITLE@", self.tr("Title")) + page = page.replace("@APPLY@", self.tr("Apply")) + page = page.replace("@CLOSE@", self.tr("Close")) + page = page.replace("@NEW-PAGE@", self.tr("New Page")) + page = page.replace("@TITLE-EDIT@", self.tr("Edit")) + page = page.replace("@TITLE-REMOVE@", self.tr("Remove")) + page = page.replace("@TITLE-RELOAD@", self.tr("Reload")) + page = page.replace("@TITLE-WARN@", + self.tr("Are you sure to remove this" + " speed dial?")) + page = page.replace("@TITLE-WARN-REL@", + self.tr("Are you sure you want to reload" + " all speed dials?")) + page = page.replace("@TITLE-FETCHTITLE@", + self.tr("Load title from page")) + page = page.replace("@SETTINGS-TITLE@", + self.tr("Speed Dial Settings")) + page = page.replace("@ADD-TITLE@", self.tr("Add New Page")) + page = page.replace("@TXT_NRROWS@", + self.tr("Maximum pages in a row:")) + page = page.replace("@TXT_SDSIZE@", + self.tr("Change size of pages:")) self._speedDialPage = page
--- a/eric6_compare.py Sat Mar 25 17:38:02 2017 +0100 +++ b/eric6_compare.py Sat Mar 25 20:05:18 2017 +0100 @@ -54,7 +54,9 @@ from UI.CompareDialog import CompareWindow if len(argv) >= 6: # assume last two entries are the files to compare - return CompareWindow([(argv[-5], argv[-2]), (argv[-3], argv[-1])]) + file1 = (argv[-4], argv[-2]) + file2 = (argv[-3], argv[-1]) + return CompareWindow([file1, file2]) elif len(argv) >= 2: return CompareWindow([("", argv[-2]), ("", argv[-1])]) else:
