Code quality

Author: PeterSurda

setup.cfg

@@ -24,7 +24,7 @@ ignore = bitmessagekivy
 [pylint.messages_control]
 disable =
     invalid-name,bare-except,broad-except,relative-import,
-    superfluous-parens,bad-option-value
+    superfluous-parens,bad-option-value,fixme
 # invalid-name: needs fixing during a large, project-wide refactor
 # bare-except,broad-except: Need fixing once thorough testing is easier
 # bad-option-value is for backward compatibility between python 2 and 3
@@ -42,7 +42,7 @@ ignore = bitmessagekivy
 [MESSAGES CONTROL]
 disable =
     invalid-name,bare-except,broad-except,relative-import,
-    superfluous-parens,bad-option-value
+    superfluous-parens,bad-option-value,fixme
 
 [DESIGN]
 max-args = 8

src/bitmessageqt/__init__.py

@@ -1298,8 +1298,8 @@ def loadMessagelist(
         tableWidget.setUpdatesEnabled(True)
 
     # create application indicator
-    def appIndicatorInit(self, app):
-        self.initTrayIcon("can-icon-24px-red.png", app)
+    def appIndicatorInit(self, _app):
+        self.initTrayIcon("can-icon-24px-red.png", _app)
         traySignal = "activated(QSystemTrayIcon::ActivationReason)"
         QtCore.QObject.connect(self.tray, QtCore.SIGNAL(
             traySignal), self.__icon_activated)
@@ -1369,7 +1369,7 @@ def getUnread(self):
         queryreturn = sqlQuery('''
         SELECT msgid, toaddress, read FROM inbox where folder='inbox'
         ''')
-        for msgid, toAddress, read in queryreturn:
+        for _, toAddress, read in queryreturn:
 
             if not read:
                 # increment the unread subscriptions if True (1)
@@ -1820,10 +1820,12 @@ def setStatusIcon(self, color):
                 "MainWindow", "Connected"))
             self.setTrayIconFile("can-icon-24px-%s.png" % color)
 
-    def initTrayIcon(self, iconFileName, app):
+    def initTrayIcon(self, iconFileName, _app):
         self.currentTrayIconFileName = iconFileName
         self.tray = QtGui.QSystemTrayIcon(
-            self.calcTrayIcon(iconFileName, self.findInboxUnreadCount()), app)
+            self.calcTrayIcon(iconFileName,
+                              self.findInboxUnreadCount()),
+            _app)
 
     def setTrayIconFile(self, iconFileName):
         self.currentTrayIconFileName = iconFileName
@@ -1925,10 +1927,7 @@ def updateSentItemStatusByAckdata(self, ackdata, textToDisplay):
             if self.getCurrentFolder(treeWidget) != "sent":
                 continue
             for i in range(sent.rowCount()):
-                toAddress = sent.item(i, 0).data(QtCore.Qt.UserRole)
                 tableAckdata = sent.item(i, 3).data()
-                status, addressVersionNumber, streamNumber, ripe = decodeAddress(
-                    toAddress)
                 if ackdata == tableAckdata:
                     sent.item(i, 3).setToolTip(textToDisplay)
                     try:
@@ -1977,7 +1976,7 @@ def displayAlert(self, title, text, exitAfterUserClicksOk):
         self.updateStatusBar(text)
         QtGui.QMessageBox.critical(self, title, text, QtGui.QMessageBox.Ok)
         if exitAfterUserClicksOk:
-            os._exit(0)
+            os._exit(0)  # pylint: disable=protected-access
 
     def rerenderMessagelistFromLabels(self):
         for messagelist in (self.ui.tableWidgetInbox,
@@ -1994,11 +1993,15 @@ def rerenderMessagelistToLabels(self):
                 messagelist.item(i, 0).setLabel()
 
     def rerenderAddressBook(self):
-        def addRow(address, label, type):
+        def addRow(address, label, row_type):
             self.ui.tableWidgetAddressBook.insertRow(0)
-            newItem = Ui_AddressBookWidgetItemLabel(address, text_type(label, 'utf-8'), type)
+            newItem = Ui_AddressBookWidgetItemLabel(address,
+                                                    text_type(label, 'utf-8'),
+                                                    row_type)
             self.ui.tableWidgetAddressBook.setItem(0, 0, newItem)
-            newItem = Ui_AddressBookWidgetItemAddress(address, text_type(label, 'utf-8'), type)
+            newItem = Ui_AddressBookWidgetItemAddress(address,
+                                                      text_type(label, 'utf-8'),
+                                                      row_type)
             self.ui.tableWidgetAddressBook.setItem(0, 1, newItem)
 
         oldRows = {}
@@ -2093,7 +2096,7 @@ def click_pushButtonSend(self):
             subject = str(self.ui.lineEditSubjectBroadcast.text().toUtf8())
             message = str(
                 self.ui.textEditMessageBroadcast.document().toPlainText().toUtf8())
-        """
+        """  # pylint: disable=pointless-string-statement
         The whole network message must fit in 2^18 bytes.
         Let's assume 500 bytes of overhead. If someone wants to get that
         too an exact number you are welcome to but I think that it would
@@ -2329,7 +2332,7 @@ def click_pushButtonSend(self):
 
     def click_pushButtonLoadFromAddressBook(self):
         self.ui.tabWidget.setCurrentIndex(5)
-        for i in range(4):
+        for _ in range(4):
             time.sleep(0.1)
             self.statusbar.clearMessage()
             time.sleep(0.1)
@@ -2873,7 +2876,7 @@ def quit(self):
             QtCore.QEventLoop.AllEvents, 1000
         )
         self.saveSettings()
-        for attr, obj in iteritems(self.ui.__dict__):
+        for _, obj in iteritems(self.ui.__dict__):
             if hasattr(obj, "__class__") \
                     and isinstance(obj, settingsmixin.SettingsMixin):
                 saveMethod = getattr(obj, "saveSettings", None)
@@ -3482,31 +3485,31 @@ def on_action_SubscriptionsDisable(self):
 
     def on_context_menuSubscriptions(self, point):
         currentItem = self.getCurrentItem()
-        self.popMenuSubscriptions = QtGui.QMenu(self)
+        popMenuSubscriptions = QtGui.QMenu(self)
         if isinstance(currentItem, Ui_AddressWidget):
-            self.popMenuSubscriptions.addAction(self.actionsubscriptionsNew)
-            self.popMenuSubscriptions.addAction(self.actionsubscriptionsDelete)
-            self.popMenuSubscriptions.addSeparator()
+            popMenuSubscriptions.addAction(self.actionsubscriptionsNew)
+            popMenuSubscriptions.addAction(self.actionsubscriptionsDelete)
+            popMenuSubscriptions.addSeparator()
             if currentItem.isEnabled:
-                self.popMenuSubscriptions.addAction(self.actionsubscriptionsDisable)
+                popMenuSubscriptions.addAction(self.actionsubscriptionsDisable)
             else:
-                self.popMenuSubscriptions.addAction(self.actionsubscriptionsEnable)
-            self.popMenuSubscriptions.addAction(self.actionsubscriptionsSetAvatar)
-            self.popMenuSubscriptions.addSeparator()
-            self.popMenuSubscriptions.addAction(self.actionsubscriptionsClipboard)
-            self.popMenuSubscriptions.addAction(self.actionsubscriptionsSend)
-            self.popMenuSubscriptions.addSeparator()
+                popMenuSubscriptions.addAction(self.actionsubscriptionsEnable)
+            popMenuSubscriptions.addAction(self.actionsubscriptionsSetAvatar)
+            popMenuSubscriptions.addSeparator()
+            popMenuSubscriptions.addAction(self.actionsubscriptionsClipboard)
+            popMenuSubscriptions.addAction(self.actionsubscriptionsSend)
+            popMenuSubscriptions.addSeparator()
 
             self._contact_selected = currentItem
             # preloaded gui.menu plugins with prefix 'address'
             for plugin in self.menu_plugins['address']:
-                self.popMenuSubscriptions.addAction(plugin)
-            self.popMenuSubscriptions.addSeparator()
+                popMenuSubscriptions.addAction(plugin)
+            popMenuSubscriptions.addSeparator()
         if self.getCurrentFolder() != 'sent':
-            self.popMenuSubscriptions.addAction(self.actionMarkAllRead)
-        if self.popMenuSubscriptions.isEmpty():
+            popMenuSubscriptions.addAction(self.actionMarkAllRead)
+        if popMenuSubscriptions.isEmpty():
             return
-        self.popMenuSubscriptions.exec_(
+        popMenuSubscriptions.exec_(
             self.ui.treeWidgetSubscriptions.mapToGlobal(point))
 
     def widgetConvert(self, widget):
@@ -3838,8 +3841,8 @@ def setAvatar(self, addressAtCurrentRow):
         # copy the image file to the appdata folder
         if (not exists) | (overwrite == QtGui.QMessageBox.Yes):
             if overwrite == QtGui.QMessageBox.Yes:
-                for file in current_files:
-                    QtCore.QFile.remove(file)
+                for _ in current_files:
+                    QtCore.QFile.remove(_)
                 QtCore.QFile.remove(destination)
             # copy it
             if sourcefile != '':
@@ -3984,6 +3987,7 @@ def on_context_menuInbox(self, point):
             self.popMenuInbox.addAction(self.actionReplyChan)
         self.popMenuInbox.addAction(self.actionReply)
         self.popMenuInbox.addAction(self.actionAddSenderToAddressBook)
+        # pylint: disable=no-member
         self.actionClipboardMessagelist = self.ui.inboxContextMenuToolbar.addAction(
             _translate("MainWindow", "Copy subject to clipboard")
             if tableWidget.currentColumn() == 2 else
@@ -4213,7 +4217,7 @@ def resetNamecoinConnection(self):
 
     def initSettings(self):
         self.loadSettings()
-        for attr, obj in iteritems(self.ui.__dict__):
+        for _, obj in iteritems(self.ui.__dict__):
             if hasattr(obj, "__class__") and \
                     isinstance(obj, settingsmixin.SettingsMixin):
                 loadMethod = getattr(obj, "loadSettings", None)

src/bitmessageqt/bitmessageui.py

@@ -7,7 +7,6 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-# pylint: disable=attribute-defined-outside-init
 from PyQt4 import QtCore, QtGui  # pylint: disable=import-error
 from bmconfigparser import config
 from foldertree import AddressBookCompleter
@@ -57,6 +56,7 @@ def _translate(context, text, disambig,
 
 
 class Ui_MainWindow(object):
+    # pylint: disable=attribute-defined-outside-init
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
         MainWindow.resize(885, 580)
@@ -182,7 +182,8 @@ def setupUi(self, MainWindow):
         self.horizontalSplitter_3.setCollapsible(1, False)
         self.gridLayout.addWidget(self.horizontalSplitter_3)
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/inbox.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/inbox.png")),
+                        QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.inbox, icon2, _fromUtf8(""))
         self.send = QtGui.QWidget()
         self.send.setObjectName(_fromUtf8("send"))
@@ -204,7 +205,8 @@ def setupUi(self, MainWindow):
         item = QtGui.QTableWidgetItem()
         icon3 = QtGui.QIcon()
         icon3.addPixmap(
-            QtGui.QPixmap(_fromUtf8(":/newPrefix/images/addressbook.png")), QtGui.QIcon.Selected, QtGui.QIcon.Off
+            QtGui.QPixmap(_fromUtf8(":/newPrefix/images/addressbook.png")),
+            QtGui.QIcon.Selected, QtGui.QIcon.Off
         )
         item.setIcon(icon3)
         self.tableWidgetAddressBook.setHorizontalHeaderItem(0, item)
@@ -366,7 +368,8 @@ def setupUi(self, MainWindow):
         self.labelHumanFriendlyTTLDescription.setSizePolicy(sizePolicy)
         self.labelHumanFriendlyTTLDescription.setMinimumSize(QtCore.QSize(45, 0))
         self.labelHumanFriendlyTTLDescription.setObjectName(_fromUtf8("labelHumanFriendlyTTLDescription"))
-        self.horizontalLayout_5.addWidget(self.labelHumanFriendlyTTLDescription, 1, QtCore.Qt.AlignLeft)
+        self.horizontalLayout_5.addWidget(self.labelHumanFriendlyTTLDescription,
+                                          1, QtCore.Qt.AlignLeft)
         self.pushButtonClear = QtGui.QPushButton(self.send)
         self.pushButtonClear.setObjectName(_fromUtf8("pushButtonClear"))
         self.horizontalLayout_5.addWidget(self.pushButtonClear, 0, QtCore.Qt.AlignRight)
@@ -388,7 +391,8 @@ def setupUi(self, MainWindow):
         self.horizontalSplitter.setCollapsible(1, False)
         self.gridLayout_7.addWidget(self.horizontalSplitter, 0, 0, 1, 1)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")),
+                        QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.send, icon4, _fromUtf8(""))
         self.subscriptions = QtGui.QWidget()
         self.subscriptions.setObjectName(_fromUtf8("subscriptions"))
@@ -691,7 +695,6 @@ def setupUi(self, MainWindow):
         MainWindow.setTabOrder(self.textEditMessage, self.pushButtonAddSubscription)
 
         # Popup menu actions container for the Sent page
-        # pylint: disable=attribute-defined-outside-init
         self.sentContextMenuToolbar = QtGui.QToolBar()
         # Popup menu actions container for chans tree
         self.addressContextMenuToolbar = QtGui.QToolBar()
@@ -739,7 +742,8 @@ def retranslateUi(self, MainWindow):
         self.label_2.setText(_translate("MainWindow", "From:", None))
         self.label.setText(_translate("MainWindow", "To:", None))
         self.tabWidgetSend.setTabText(
-            self.tabWidgetSend.indexOf(self.sendDirect), _translate("MainWindow", "Send ordinary Message", None)
+            self.tabWidgetSend.indexOf(self.sendDirect),
+            _translate("MainWindow", "Send ordinary Message", None)
         )
         self.label_8.setText(_translate("MainWindow", "From:", None))
         self.label_7.setText(_translate("MainWindow", "Subject:", None))
@@ -822,17 +826,7 @@ def retranslateUi(self, MainWindow):
         self.actionRegenerateDeterministicAddresses.setText(
             _translate("MainWindow", "Regenerate deterministic addresses", None)
         )
-        self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
+        self.actionDeleteAllTrashedMessages.setText(
+            _translate("MainWindow", "Delete all trashed messages", None))
         self.actionJoinChan.setText(_translate("MainWindow", "Join / Create chan", None))
         self.updateNetworkSwitchMenuLabel()
-
-
-if __name__ == "__main__":
-    import sys
-
-    app = QtGui.QApplication(sys.argv)
-    MainWindow = settingsmixin.SMainWindow()
-    ui = Ui_MainWindow()
-    ui.setupUi(MainWindow)
-    MainWindow.show()
-    sys.exit(app.exec_())

src/bitmessageqt/messagecompose.py

@@ -2,7 +2,7 @@
 Message editor with a wheel zoom functionality
 """
 
-from PyQt4 import QtCore, QtGui  # pylint disable=import-error
+from PyQt4 import QtCore, QtGui  # pylint: disable=import-error
 
 
 class MessageCompose(QtGui.QTextEdit):

src/bitmessageqt/tests/test_widgets.py

@@ -8,6 +8,7 @@
 import sys
 import unittest
 
+# pylint: disable=import-outside-toplevel,unused-import
 try:
     from PyQt4 import QtCore, QtGui, QtTest
     has_qt = True

src/bitmessageqt/utils.py

@@ -105,11 +105,9 @@ def avatarize(address):
         lower_default = state.appdata + 'avatars/' + 'default.' + ext.lower()
         upper_default = state.appdata + 'avatars/' + 'default.' + ext.upper()
         if os.path.isfile(lower_default):
-            default = lower_default
             idcon.addFile(lower_default)
             return idcon
         elif os.path.isfile(upper_default):
-            default = upper_default
             idcon.addFile(upper_default)
             return idcon
     # If no avatar is found

src/build_osx.py

@@ -1,7 +1,7 @@
 """Building osx."""
 import os
 from glob import glob
-from PyQt4 import QtCore
+from PyQt4 import QtCore  # pylint: disable=import-error
 from setuptools import setup
 
 name = "Bitmessage"

src/class_sqlThread.py

@@ -34,8 +34,12 @@ class sqlThread(threading.Thread):
 
     def __init__(self):
         threading.Thread.__init__(self, name="SQL")
+        self.conn = None
+        self.cur = None
 
-    def run(self):  # pylint: disable=too-many-locals, too-many-branches, too-many-statements
+    # pylint: disable=protected-access,too-many-locals
+    # pylint: disable=too-many-branches,too-many-statements
+    def run(self):
         """Process SQL queries from `.helper_sql.sqlSubmitQueue`"""
         helper_sql.sql_available = True
         config_ready.wait()

src/helper_msgcoding.py

@@ -56,6 +56,7 @@ def __init__(self, message, encoding=BITMESSAGE_ENCODING_SIMPLE):
         else:
             raise MsgEncodeException("Unknown encoding %i" % (encoding))
 
+    # pylint: disable=no-member
     def encodeExtended(self, message):
         """Handle extended encoding"""
         try:
@@ -118,6 +119,7 @@ def decodeExtended(self, data):
 
         try:
             tmp = msgpack.loads(tmp)
+        # pylint: disable=no-member
         except (msgpack.exceptions.UnpackException,
                 msgpack.exceptions.ExtraData):
             logger.error("Error msgunpacking message")

src/mockbm/kivy_main.py

@@ -4,7 +4,7 @@
 """Mock kivy app with mock threads."""
 
 import os
-from kivy.config import Config
+from kivy.config import Config  # pylint: disable=import-error
 from pybitmessage.mockbm import multiqueue
 from pybitmessage import state