From e97d02ed783f713ebd8e3150cf155277932f2de1 Mon Sep 17 00:00:00 2001 From: lakshyacis Date: Mon, 7 Oct 2019 13:38:26 +0530 Subject: [PATCH] depends pylint fixes --- src/depends.py | 23 ++++++++++++----------- src/helper_ackPayload.py | 8 +++++--- src/helper_bitcoin.py | 1 + src/helper_inbox.py | 4 ++-- src/helper_random.py | 4 +++- src/helper_sql.py | 3 +-- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/depends.py b/src/depends.py index 7ae9220e..68fba01a 100755 --- a/src/depends.py +++ b/src/depends.py @@ -113,6 +113,7 @@ PACKAGES = { def detectOS(): + """Finding out what Operating System is running""" if detectOS.result is not None: return detectOS.result if sys.platform.startswith('openbsd'): @@ -132,6 +133,7 @@ detectOS.result = None def detectOSRelease(): + """Detecting the release of OS""" with open("/etc/os-release", 'r') as osRelease: version = None for line in osRelease: @@ -148,6 +150,7 @@ def detectOSRelease(): def try_import(module, log_extra=False): + """Try to import the non imported packages""" try: return import_module(module) except ImportError: @@ -208,10 +211,8 @@ def check_sqlite(): ).fetchone()[0] logger.info('SQLite Library Source ID: %s', sqlite_source_id) if sqlite_version_number >= 3006023: - compile_options = ', '.join(map( - lambda row: row[0], - conn.execute('PRAGMA compile_options;') - )) + compile_options = ', '.join( + [row[0] for row in conn.execute('PRAGMA compile_options;')]) logger.info( 'SQLite Library Compile Options: %s', compile_options) # There is no specific version requirement as yet, so we just @@ -230,13 +231,13 @@ def check_sqlite(): conn.close() -def check_openssl(): +def check_openssl(): # pylint: disable=too-many-branches, too-many-return-statements """Do openssl dependency check. Here we are checking for openssl with its all dependent libraries and version checking. """ - + # pylint: disable=protected-access, redefined-outer-name ctypes = try_import('ctypes') if not ctypes: logger.error('Unable to check OpenSSL.') @@ -300,7 +301,7 @@ def check_openssl(): ' ECDH, and ECDSA enabled.') return False matches = cflags_regex.findall(openssl_cflags) - if len(matches) > 0: + if matches: logger.error( 'This OpenSSL library is missing the following required' ' features: %s. PyBitmessage requires OpenSSL 0.9.8b' @@ -311,13 +312,13 @@ def check_openssl(): return False -# TODO: The minimum versions of pythondialog and dialog need to be determined +# ..todo:: The minimum versions of pythondialog and dialog need to be determined def check_curses(): """Do curses dependency check. - Here we are checking for curses if available or not with check - as interface requires the pythondialog - package and the dialog utility. + Here we are checking for curses if available or not with check as interface + requires the `pythondialog `_ package + and the dialog utility. """ if sys.hexversion < 0x20600F0: logger.error( diff --git a/src/helper_ackPayload.py b/src/helper_ackPayload.py index acdbadf7..15ac0058 100644 --- a/src/helper_ackPayload.py +++ b/src/helper_ackPayload.py @@ -1,9 +1,11 @@ -"""This module is for generating ack payload.""" +""" +This module is for generating ack payload +""" +from binascii import hexlify +from struct import pack import highlevelcrypto import helper_random -from binascii import hexlify -from struct import pack from addresses import encodeVarint # This function generates payload objects for message acknowledgements diff --git a/src/helper_bitcoin.py b/src/helper_bitcoin.py index d56e395b..f8146285 100644 --- a/src/helper_bitcoin.py +++ b/src/helper_bitcoin.py @@ -3,6 +3,7 @@ from pyelliptic import arithmetic # This function expects that pubkey begin with \x04 def calculateBitcoinAddressFromPubkey(pubkey): + """This function expects that pubkey begin's with the bitcoin prefix""" if len(pubkey) != 65: print 'Could not calculate Bitcoin address from pubkey because function was passed a pubkey that was', len(pubkey), 'bytes long rather than 65.' return "error" diff --git a/src/helper_inbox.py b/src/helper_inbox.py index 1b1710d6..7cb860dc 100644 --- a/src/helper_inbox.py +++ b/src/helper_inbox.py @@ -1,11 +1,11 @@ -"""Helper Inbox performs inbox messages related operations.""" +"""Helper Inbox performs inbox messages related operations""" from helper_sql import sqlExecute, sqlQuery import queues def insert(t): - """Perform an insert into the "inbox" table""" + """Perform an insert into the "inbox" table""" sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *t) # shouldn't emit changedInboxUnread and displayNewInboxMessage # at the same time diff --git a/src/helper_random.py b/src/helper_random.py index 57f0ccb3..edc70a01 100644 --- a/src/helper_random.py +++ b/src/helper_random.py @@ -1,4 +1,6 @@ -"""Convenience functions for random operations. Not suitable for security / cryptography operations.""" +""" +Convenience functions for random operations. Not suitable for security / cryptography operations +""" import os import random diff --git a/src/helper_sql.py b/src/helper_sql.py index ad0a5dc4..16d36637 100644 --- a/src/helper_sql.py +++ b/src/helper_sql.py @@ -2,11 +2,9 @@ SQL-related functions defined here are really pass the queries (or other SQL commands) to :class:`.threads.sqlThread` through `sqlSubmitQueue` queue and check or return the result got from `sqlReturnQueue`. - This is done that way because :mod:`sqlite3` is so thread-unsafe that they won't even let you call it from different threads using your own locks. SQLite objects can only be used from one thread. - .. note:: This actually only applies for certain deployments, and/or really old version of sqlite. I haven't actually seen it anywhere. Current versions do have support for threading and multiprocessing. @@ -50,6 +48,7 @@ def sqlQuery(sqlStatement, *args): def sqlExecuteChunked(sqlStatement, idCount, *args): + """Execute chunked SQL statement to avoid argument limit""" # SQLITE_MAX_VARIABLE_NUMBER, # unfortunately getting/setting isn't exposed to python sqlExecuteChunked.chunkSize = 999