Merge pull request #35 from jaicis/py3codefix

Logging and modules issues fixes

pybitmessage

@@ -1 +0,0 @@
-src

src/bitmessagekivy/mpybit.py

@@ -1,8 +1,8 @@
 """
 Bitmessage android(mobile) interface
 """
-# pylint: disable=import-error,no-name-in-module,unused-argument,too-few-public-methods,too-many-arguments
+# pylint: disable=too-many-lines,import-error,no-name-in-module,unused-argument
-# pylint: disable=too-many-ancestors,too-many-locals,useless-super-delegation,attribute-defined-outside-init
+# pylint: disable=too-many-ancestors,too-many-locals,useless-super-delegation
 import os
 import time
 from bitmessagekivy import identiconGeneration
@@ -62,7 +62,7 @@ from semaphores import kivyuisignaler
 
 import state
 from addresses import decodeAddress
-
+# pylint: disable=too-few-public-methods,too-many-arguments,attribute-defined-outside-init
 
 KVFILES = [
     'settings', 'popup', 'allmails', 'draft',
@@ -509,7 +509,8 @@ class AddressBook(Screen):
     def delete_address(self, address, instance, *args):
         """Delete inbox mail from inbox listing"""
         self.ids.ml.remove_widget(instance.parent.parent)
-        if len(self.ids.ml.children) == 0:
+        # if len(self.ids.ml.children) == 0:
+        if self.ids.ml.children is not None:
             self.ids.identi_tag.children[0].text = ''
         sqlExecute(
             "DELETE FROM  addressbook WHERE address = '{}';".format(address))
@@ -1263,7 +1264,7 @@ class Setting(Screen):
 
 class NavigateApp(MDApp):
     """Navigation Layout of class"""
-    # pylint: disable=too-many-public-methods
+    # pylint: disable=too-many-public-methods,inconsistent-return-statements
 
     # theme_cls = ThemeManager()
     previous_date = ObjectProperty()
@@ -1280,8 +1281,7 @@ class NavigateApp(MDApp):
     def build(self):
         """Method builds the widget"""
         for kv_file in KVFILES:
-            Builder.load_file(
+            Builder.load_file(os.path.join(os.path.dirname(__file__), "kv/{}.kv").format(kv_file))
-                os.path.join(os.path.dirname(__file__), f"kv/{kv_file}.kv"))
         self.obj_1 = AddressBook()
         kivysignalthread = UIkivySignaler()
         kivysignalthread.daemon = True
@@ -1298,7 +1298,6 @@ class NavigateApp(MDApp):
     @staticmethod
     def showmeaddresses(name="text"):
         """Show the addresses in spinner to make as dropdown"""
-        # pylint: disable=inconsistent-return-statements
         if name == "text":
             if BMConfigParser().addresses():
                 return BMConfigParser().addresses()[0][:16] + '..'
@@ -1590,6 +1589,7 @@ class NavigateApp(MDApp):
             msg_counter_objs.allmail_cnt.badge_text = state.all_count
 
     def on_start(self):
+        """Setting message count"""
         self.set_message_count()
 
     # @staticmethod
@@ -2585,6 +2585,7 @@ class NavigationDrawerDivider(OneLineListItem):
     _txt_bot_pad = NumericProperty(dp(8))
 
     def __init__(self, **kwargs):
+        # pylint: disable=bad-super-call
         super(OneLineListItem, self).__init__(**kwargs)
         self.height = dp(16)
 

src/bitmessagemain.py

@@ -371,7 +371,7 @@ class Main(object):
 
             elif state.kivy:
                 config.remove_option('bitmessagesettings', 'dontconnect')
-                # pylint: disable=no-member, import-error
+                # pylint: disable=no-member,import-error,no-name-in-module,relative-import
                 from bitmessagekivy.mpybit import NavigateApp
                 state.kivyapp = NavigateApp()
                 state.kivyapp.run()

src/bmconfigparser.py

@@ -117,6 +117,7 @@ class BMConfigParser(configparser.ConfigParser):
             return default
 
     def items(self, section, raw=False, variables=None):
+        # pylint: disable=signature-differs
         """Return section variables as parent,
         but override the "raw" argument to always True"""
         return configparser.ConfigParser.items(self, section, True, variables)

src/multiqueue.py

@@ -22,7 +22,7 @@ class MultiQueue(Queue.Queue):
         Queue.Queue.__init__(self, maxsize)
 
     # Initialize the queue representation
-    def _init(self, maxsize):
+    def _init(self, _):
         self.iter = 0
         self.queues = []
         for _ in range(self.queueCount):

src/network/bmproto.py

@@ -1,7 +1,7 @@
 """
 Bitmessage Protocol
 """
-# pylint: disable=attribute-defined-outside-init, too-few-public-methods
+# pylint: disable=attribute-defined-outside-init, too-few-public-methods, logging-format-interpolation
 import base64
 import hashlib
 import logging
@@ -123,7 +123,8 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
             length=protocol.Header.size, expectBytes=self.payloadLength)
         return True
 
-    def state_bm_command(self):  # pylint: disable=too-many-branches, too-many-statements
+    def state_bm_command(self):
+        # pylint: disable=too-many-branches, too-many-statements
         """Process incoming command"""
         self.payload = self.read_buf[:self.payloadLength]
         if self.checksum != hashlib.sha512(self.payload).digest()[0:4]:

src/network/connectionchooser.py

@@ -1,7 +1,7 @@
 """
 Select which node to connect to
 """
-# pylint: disable=too-many-branches
+# pylint: disable=too-many-branches, logging-format-interpolation, unidiomatic-typecheck
 import logging
 import random  # nosec
 

src/network/connectionpool.py

@@ -190,7 +190,7 @@ class BMConnectionPool(object):
     def startListening(self, bind=None):
         """Open a listening socket and start accepting connections on it"""
         if bind is None:
-            "this return blank host"
+            """this return blank host"""
             bind = self.getListeningIP()
         port = BMConfigParser().safeGetInt("bitmessagesettings", "port")
         # correct port even if it changed

src/network/tcp.py

@@ -30,7 +30,7 @@ from network.socks5 import Socks5Connection
 from network.tls import TLSDispatcher
 from .node import Peer
 from queues import UISignalQueue, invQueue, receiveDataQueue
-
+# pylint: disable=logging-format-interpolation
 
 logger = logging.getLogger('default')
 

src/network/udp.py

@@ -14,6 +14,7 @@ import state
 from queues import receiveDataQueue
 
 logger = logging.getLogger('default')
+# pylint: disable=logging-format-interpolation
 
 
 class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
@@ -91,8 +92,8 @@ class UDPSocket(BMProto):  # pylint: disable=too-many-instance-attributes
         if remoteport is False:
             return True
         logger.debug(
-            "received peer discovery from {}:{} (port {}):",
+            "received peer discovery from {}:{} (port {}):".format(
-            self.destination.host, self.destination.port, remoteport)
+                self.destination.host, self.destination.port, remoteport))
         if self.local:
             state.discoveredPeers[Peer(self.destination.host, remoteport)] = \
                 time.time()

src/protocol.py

@@ -2,7 +2,7 @@
 Low-level protocol-related functions.
 """
 # pylint: disable=too-many-boolean-expressions,too-many-return-statements
-# pylint: disable=too-many-locals,too-many-statements
+# pylint: disable=too-many-locals,too-many-statements,logging-format-interpolation
 
 import base64
 import hashlib
@@ -65,6 +65,7 @@ Header = Struct('!L12sL4s')
 VersionPacket = Struct('>LqQ20s4s36sH')
 
 # Bitfield
+# pylint: disable=unidiomatic-typecheck
 
 
 def getBitfield(address):

src/shared.py

@@ -24,7 +24,7 @@ from addresses import decodeAddress, encodeVarint
 from bmconfigparser import BMConfigParser
 from debug import logger
 from helper_sql import sqlQuery
-
+# pylint: disable=logging-format-interpolation
 
 verbose = 1
 # This is obsolete with the change to protocol v3

src/tests/test_networkgroup.py

@@ -10,6 +10,7 @@ class TestNetworkGroup(unittest.TestCase):
     """
     def test_network_group(self):
         """Test various types of network groups"""
+        # pylint: disable=import-error
         from pybitmessage.protocol import network_group
 
         test_ip = '1.2.3.4'