Code quality

Author: PeterSurda

setup.cfg

@@ -24,7 +24,9 @@ ignore = bitmessagekivy
 [pylint.messages_control]
 disable =
     invalid-name,bare-except,broad-except,relative-import,
-    superfluous-parens,bad-option-value,fixme
+    superfluous-parens,bad-option-value,fixme,missing-docstring,
+    too-many-locals,too-few-public-methods,too-many-statements,
+    too-many-instance-attributes,too-many-public-methods
 # 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 +44,9 @@ ignore = bitmessagekivy
 [MESSAGES CONTROL]
 disable =
     invalid-name,bare-except,broad-except,relative-import,
-    superfluous-parens,bad-option-value,fixme
+    superfluous-parens,bad-option-value,fixme,missing-docstring,
+    too-many-locals,too-few-public-methods,too-many-statements,
+    too-many-instance-attributes,too-many-public-methods
 
 [DESIGN]
 max-args = 8

src/bitmessagecli.py

@@ -188,7 +188,6 @@ def apiInit(apiEnabled):
 def apiData():
     """TBC"""
 
-    global keysName
     global keysPath
     global usrPrompt
 

src/bitmessageqt/__init__.py

@@ -2,6 +2,7 @@
 PyQt based UI for bitmessage, the main module
 """
 # pylint: disable=import-error,too-many-lines,no-member
+# pylint: disable=too-many-branches
 import hashlib
 import locale
 import os
@@ -760,6 +761,11 @@ def __init__(self, parent=None):
 
         self.unreadCount = 0
 
+        self.currentTrayIconFileName = ""
+        self.actionQuiet = None
+        self.actionShow = None
+        self.tray = None
+
         # Set the icon sizes for the identicons
         identicon_size = 3 * 7
         self.ui.tableWidgetInbox.setIconSize(QtCore.QSize(identicon_size, identicon_size))
@@ -3978,12 +3984,12 @@ def on_context_menuInbox(self, point):
         popMenuInbox.addAction(self.actionReply)
         popMenuInbox.addAction(self.actionAddSenderToAddressBook)
         # pylint: disable=no-member
-        self.actionClipboardMessagelist = self.ui.inboxContextMenuToolbar.addAction(
+        actionClipboardMessagelist = self.ui.inboxContextMenuToolbar.addAction(
             _translate("MainWindow", "Copy subject to clipboard")
             if tableWidget.currentColumn() == 2 else
             _translate("MainWindow", "Copy address to clipboard"),
             self.on_action_ClipboardMessagelist)
-        popMenuInbox.addAction(self.actionClipboardMessagelist)
+        popMenuInbox.addAction(actionClipboardMessagelist)
         # pylint: disable=no-member
         self._contact_selected = tableWidget.item(currentRow, 1)
         # preloaded gui.menu plugins with prefix 'address'
@@ -4229,7 +4235,7 @@ class BitmessageQtApplication(QtGui.QApplication):
     """
 
     # Unique identifier for this application
-    uuid = '6ec0149b-96e1-4be1-93ab-1465fb3ebf7c'
+    UUID = '6ec0149b-96e1-4be1-93ab-1465fb3ebf7c'
 
     @staticmethod
     def get_windowstyle():
@@ -4241,7 +4247,6 @@ def get_windowstyle():
 
     def __init__(self, *argv):
         super(BitmessageQtApplication, self).__init__(*argv)
-        id = BitmessageQtApplication.uuid
 
         QtCore.QCoreApplication.setOrganizationName("PyBitmessage")
         QtCore.QCoreApplication.setOrganizationDomain("bitmessage.org")
@@ -4259,14 +4264,14 @@ def __init__(self, *argv):
         self.is_running = False
 
         socket = QLocalSocket()
-        socket.connectToServer(id)
+        socket.connectToServer(self.UUID)
         self.is_running = socket.waitForConnected()
 
         # Cleanup past crashed servers
         if not self.is_running:
             if socket.error() == QLocalSocket.ConnectionRefusedError:
                 socket.disconnectFromServer()
-                QLocalServer.removeServer(id)
+                QLocalServer.removeServer(self.UUID)
 
         socket.abort()
 
@@ -4278,7 +4283,7 @@ def __init__(self, *argv):
             # Nope, create a local server with this id and assign on_new_connection
             # for whenever a second instance tries to run focus the application.
             self.server = QLocalServer()
-            self.server.listen(id)
+            self.server.listen(self.UUID)
             self.server.newConnection.connect(self.on_new_connection)
 
         self.setStyleSheet("QStatusBar::item { border: 0px solid black }")
@@ -4293,20 +4298,20 @@ def on_new_connection(self):
 
 
 def init():
-    global app
+    global app  # pylint: disable=global-statement
     if not app:
         app = BitmessageQtApplication(sys.argv)
     return app
 
 
 def run():
-    global myapp
-    app = init()
-    myapp = MyForm()
+    global myapp  # pylint: disable=global-statement
+    _app = init()
+    myapp = MyForm()  # pylint: disable=redefined-outer-name
 
     myapp.appIndicatorInit(app)
 
-    if myapp._firstrun:
+    if myapp._firstrun:  # pylint: disable=protected-access
         myapp.showConnectDialog()  # ask the user if we may connect
 
     # only show after wizards and connect dialogs have completed
@@ -4315,4 +4320,4 @@ def run():
         QtCore.QTimer.singleShot(
             30000, lambda: myapp.setStatusIcon(state.statusIconColor))
 
-    app.exec_()
+    _app.exec_()

src/bitmessageqt/account.py

@@ -68,6 +68,7 @@ def accountClass(address):
             if subscription.type != AccountMixin.BROADCAST:
                 return None
         else:
+            # pylint: disable=redefined-variable-type
             subscription = SubscriptionAccount(address)
             if subscription.type != AccountMixin.SUBSCRIPTION:
                 # e.g. deleted chan

src/bitmessageqt/bitmessage_icons_rc.py

@@ -7,6 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
+# pylint: disable=too-many-lines
 from PyQt4 import QtCore  # pylint: disable=import-error
 
 qt_resource_data = "\

src/bitmessageqt/foldertree.py

@@ -410,6 +410,7 @@ def setLabel(self, label=None):
                 AccountMixin.NORMAL,
                 AccountMixin.CHAN, AccountMixin.MAILINGLIST):
             try:
+                # pylint: disable=redefined-variable-type
                 newLabel = unicode(
                     config.get(self.address, 'label'),
                     'utf-8', 'ignore')

src/bitmessageqt/migrationwizard.py

@@ -66,6 +66,7 @@ def __init__(self):
 
 
 class Ui_MigrationWizard(QtGui.QWizard):
+    # pylint: disable=redefined-variable-type
     def __init__(self, addresses):
         super(QtGui.QWizard, self).__init__()
 

src/bitmessageqt/uisignaler.py

@@ -17,6 +17,7 @@ def get(cls):
             cls._instance = UISignaler()
         return cls._instance
 
+    # pylint: disable=too-many-branches
     def run(self):
         while True:
             command, data = queues.UISignalQueue.get()

src/class_singleWorker.py

@@ -1399,7 +1399,7 @@ def requestPubKey(self, toAddress):
         TTL = 2.5 * 24 * 60 * 60
         TTL *= 2 ** retryNumber
         if TTL > 28 * 24 * 60 * 60:
-            TTL = 28 * 24 * 60 * 60
+            TTL = float(28 * 24 * 60 * 60)
         # add some randomness to the TTL
         TTL = TTL + helper_random.randomrandrange(-300, 300)
         embeddedTime = int(time.time() + TTL)

src/class_sqlThread.py

@@ -108,8 +108,7 @@ def run(self):
         # usedpersonally field in their pubkeys table. Let's add it.
         if settingsversion == 2:
             item = '''ALTER TABLE pubkeys ADD usedpersonally text DEFAULT 'no' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
             self.conn.commit()
 
             settingsversion = 3
@@ -119,16 +118,13 @@ def run(self):
         # in the inbox table. Let's add them.
         if settingsversion == 3:
             item = '''ALTER TABLE inbox ADD encodingtype int DEFAULT '2' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
 
             item = '''ALTER TABLE inbox ADD read bool DEFAULT '1' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
 
             item = '''ALTER TABLE sent ADD encodingtype int DEFAULT '2' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
             self.conn.commit()
 
             settingsversion = 4
@@ -144,8 +140,7 @@ def run(self):
         # version we are on can stay embedded in the messages.dat file. Let us
         # check to see if the settings table exists yet.
         item = '''SELECT name FROM sqlite_master WHERE type='table' AND name='settings';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         if self.cur.fetchall() == []:
             # The settings table doesn't exist. We need to make it.
             logger.debug(
@@ -199,8 +194,7 @@ def run(self):
         # Let's get rid of the first20bytesofencryptedmessage field in
         # the inventory table.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         if int(self.cur.fetchall()[0][0]) == 2:
             logger.debug(
                 'In messages.dat database, removing an obsolete field from'
@@ -227,25 +221,22 @@ def run(self):
 
         # Add a new column to the inventory table to store tags.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 1 or currentVersion == 3:
             logger.debug(
                 'In messages.dat database, adding tag field to'
                 ' the inventory table.')
             item = '''ALTER TABLE inventory ADD tag blob DEFAULT '' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
             item = '''update settings set value=? WHERE key='version';'''
             parameters = (4,)
             self.cur.execute(item, parameters)
 
         # Add a new column to the pubkeys table to store the address version.
         # We're going to trash all of our pubkeys and let them be redownloaded.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 4:
             self.cur.execute('''DROP TABLE pubkeys''')
@@ -261,8 +252,7 @@ def run(self):
         # Add a new table: objectprocessorqueue with which to hold objects
         # that have yet to be processed if the user shuts down Bitmessage.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 5:
             self.cur.execute('''DROP TABLE knownnodes''')
@@ -277,8 +267,7 @@ def run(self):
         # In table inventory and objectprocessorqueue, objecttype is now
         # an integer (it was a human-friendly string previously)
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 6:
             logger.debug(
@@ -303,8 +292,7 @@ def run(self):
         # clear it, and the pubkeys from inventory, so that they'll
         # be re-downloaded.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 7:
             logger.debug(
@@ -327,16 +315,14 @@ def run(self):
         # the message signature. We'll use this as temporary message UUID
         # in order to detect duplicates.
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 8:
             logger.debug(
                 'In messages.dat database, adding sighash field to'
                 ' the inbox table.')
             item = '''ALTER TABLE inbox ADD sighash blob DEFAULT '' '''
-            parameters = ''
-            self.cur.execute(item, parameters)
+            self.cur.execute(item)
             item = '''update settings set value=? WHERE key='version';'''
             parameters = (9,)
             self.cur.execute(item, parameters)
@@ -345,8 +331,7 @@ def run(self):
         # can combine the pubkeyretrynumber and msgretrynumber into one.
 
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 9:
             logger.info(
@@ -406,8 +391,7 @@ def run(self):
 
         # Update the address colunm to unique in addressbook table
         item = '''SELECT value FROM settings WHERE key='version';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         currentVersion = int(self.cur.fetchall()[0][0])
         if currentVersion == 10:
             logger.debug(
@@ -470,8 +454,7 @@ def run(self):
         # Let us check to see the last time we vaccumed the messages.dat file.
         # If it has been more than a month let's do it now.
         item = '''SELECT value FROM settings WHERE key='lastvacuumtime';'''
-        parameters = ''
-        self.cur.execute(item, parameters)
+        self.cur.execute(item)
         queryreturn = self.cur.fetchall()
         for row in queryreturn:
             value, = row
@@ -643,5 +626,5 @@ def create_function(self):
             self.conn.create_function("enaddr", 3, func=encodeAddress, deterministic=True)
         except (TypeError, sqlite3.NotSupportedError) as err:
             logger.debug(
-                "Got error while pass deterministic in sqlite create function {}, Passing 3 params".format(err))
+                "Got error while pass deterministic in sqlite create function %s, Passing 3 params", err)
             self.conn.create_function("enaddr", 3, encodeAddress)