Added/corrected timeouts for sqlite3 database connections

Bumped mail plugin patch version for sqlite3 timeout change
Code formatting corrections

src/coredb/blockmetadb/__init__.py

@@ -1,7 +1,6 @@
-"""
-    Onionr - Private P2P Communication
+"""Onionr - Private P2P Communication.
 
-    This module works with information relating to blocks stored on the node
+Work with information relating to blocks stored on the node
 """
 import sqlite3
 
@@ -27,18 +26,18 @@ update_block_info = updateblockinfo.update_block_info
 add_to_block_DB = add.add_to_block_DB
 
 
-def get_block_list(dateRec = None, unsaved = False):
-    """
-        Get list of our blocks
-    """
-    if dateRec == None:
-        dateRec = 0
+def get_block_list(date_rec=None, unsaved=False):
+    """Get list of our blocks."""
+    if date_rec is None:
+        date_rec = 0
 
-    conn = sqlite3.connect(dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+    conn = sqlite3.connect(
+        dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
 
-    execute = 'SELECT hash FROM hashes WHERE dateReceived >= ? ORDER BY dateReceived ASC;'
-    args = (dateRec,)
+    execute = 'SELECT hash FROM hashes WHERE dateReceived' + \
+        ' >= ? ORDER BY dateReceived ASC;'
+    args = (date_rec,)
     rows = list()
     for row in c.execute(execute, args):
         for i in row:
@@ -48,11 +47,9 @@ def get_block_list(dateRec = None, unsaved = False):
 
 
 def get_block_date(blockHash):
-    """
-        Returns the date a block was received
-    """
-
-    conn = sqlite3.connect(dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+    """Return the date a block was received."""
+    conn = sqlite3.connect(
+        dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
 
     execute = 'SELECT dateReceived FROM hashes WHERE hash=?;'
@@ -65,11 +62,10 @@ def get_block_date(blockHash):
 
 
 def get_blocks_by_type(blockType, orderDate=True):
-    """
-        Returns a list of blocks by the type
-    """
+    """Return a list of blocks by the type."""
 
-    conn = sqlite3.connect(dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+    conn = sqlite3.connect(
+        dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
 
     if orderDate:

src/coredb/blockmetadb/expiredblocks.py

@@ -1,9 +1,12 @@
-'''
-    Onionr - Private P2P Communication
+"""Onionr - Private P2P Communication.
 
-    Get a list of expired blocks still stored
-'''
-'''
+Get a list of expired blocks still stored
+"""
+import sqlite3
+from onionrutils import epoch
+from .. import dbfiles
+from etc import onionrvalues
+"""
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
@@ -16,15 +19,13 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-'''
-import sqlite3
-from onionrutils import epoch
-from .. import dbfiles
-from etc import onionrvalues
+"""
+
 
 def get_expired_blocks():
-    '''Returns a list of expired blocks'''
-    conn = sqlite3.connect(dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+    """Return a list of expired blocks"""
+    conn = sqlite3.connect(
+        dbfiles.block_meta_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
     date = int(epoch.get_epoch())
 

src/coredb/keydb/transportinfo.py

@@ -1,9 +1,11 @@
-'''
-    Onionr - Private P2P Communication
+"""Onionr - Private P2P Communication.
 
-    get or set transport address meta information
-'''
-'''
+get or set transport address meta information
+"""
+import sqlite3
+from .. import dbfiles
+from etc import onionrvalues
+"""
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
@@ -16,28 +18,27 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-'''
-import sqlite3
-from .. import dbfiles
-from etc import onionrvalues
+"""
+
 
 def get_address_info(address, info):
-    '''
-        Get info about an address from its database entry
+    """
+    Get info about an address from its database entry
 
-        address text, 0
-        type int, 1
-        knownPeer text, 2
-        speed int, 3
-        success int, 4
-        powValue    5
-        failure int 6
-        lastConnect 7
-        trust       8
-        introduced  9
-    '''
+    address text, 0
+    type int, 1
+    knownPeer text, 2
+    speed int, 3
+    success int, 4
+    powValue    5
+    failure int 6
+    lastConnect 7
+    trust       8
+    introduced  9
+    """
 
-    conn = sqlite3.connect(dbfiles.address_info_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+    conn = sqlite3.connect(
+        dbfiles.address_info_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
 
     command = (address,)
@@ -57,12 +58,12 @@ def get_address_info(address, info):
 
     return retVal
 
-def set_address_info(address, key, data):
-    '''
-        Update an address for a key
-    '''
 
-    conn = sqlite3.connect(dbfiles.address_info_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
+def set_address_info(address, key, data):
+    """Update an address for a key."""
+
+    conn = sqlite3.connect(
+        dbfiles.address_info_db, timeout=onionrvalues.DATABASE_LOCK_TIMEOUT)
     c = conn.cursor()
 
     command = (data, address)