Bitmessage/PyBitmessage-2024-12-19
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Pycodestyle Fixes

Browse Source
This commit is contained in:
lakshyacis 2019-08-27 20:21:46 +05:30
parent 29e06d9eca
commit 0ae2112603
No known key found for this signature in database
GPG Key ID: D2C539C8EC63E9EB
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bitmessageqt/account.py
View File

@ -34,7 +34,8 @@ def getSortedAccounts():
def getSortedSubscriptions(count=False): def getSortedSubscriptions(count=False):
"""Actually return a grouped dictionary rather than a sorted list """Actually return a grouped dictionary rather than a sorted list."""
"""
:param count: Whether to count messages for each fromaddress in the inbox :param count: Whether to count messages for each fromaddress in the inbox
:type count: bool, default False :type count: bool, default False
:retuns: dict keys are addresses, values are dicts containing settings :retuns: dict keys are addresses, values are dicts containing settings
@ -51,7 +52,8 @@ def getSortedSubscriptions(count=False):
ret[address]["inbox"]['enabled'] = enabled ret[address]["inbox"]['enabled'] = enabled
ret[address]["inbox"]['count'] = 0 ret[address]["inbox"]['count'] = 0
if count: if count:
queryreturn = sqlQuery('''SELECT fromaddress, folder, count(msgid) as cnt queryreturn = sqlQuery(
'''SELECT fromaddress, folder, count(msgid) as cnt
FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress
WHERE read = 0 AND toaddress = ? WHERE read = 0 AND toaddress = ?
GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers) GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers)
@ -82,12 +84,13 @@ def accountClass(address):
return subscription return subscription
try: try:
gateway = BMConfigParser().get(address, "gateway") gateway = BMConfigParser().get(address, "gateway")
for _, cls in inspect.getmembers(sys.modules[__name__], inspect.isclass): for _, cls in inspect.getmembers(
sys.modules[__name__], inspect.isclass):
if issubclass(cls, GatewayAccount) and cls.gatewayName == gateway: if issubclass(cls, GatewayAccount) and cls.gatewayName == gateway:
return cls(address) return cls(address)
# general gateway # general gateway
return GatewayAccount(address) return GatewayAccount(address)
except: except Exception:
pass pass
# no gateway # no gateway
return BMAccount(address) return BMAccount(address)
@ -108,7 +111,8 @@ class AccountColor(AccountMixin): # pylint: disable=too-few-public-methods
elif BMConfigParser().safeGetBoolean(self.address, 'chan'): elif BMConfigParser().safeGetBoolean(self.address, 'chan'):
self.type = AccountMixin.CHAN self.type = AccountMixin.CHAN
elif sqlQuery( elif sqlQuery(
'''select label from subscriptions where address=?''', self.address): '''select label from subscriptions where address=?''',
self.address):
self.type = AccountMixin.SUBSCRIPTION self.type = AccountMixin.SUBSCRIPTION
else: else:
self.type = AccountMixin.NORMAL self.type = AccountMixin.NORMAL
@ -132,7 +136,8 @@ class BMAccount(object):
self.type = AccountMixin.BROADCAST self.type = AccountMixin.BROADCAST
else: else:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address) '''select label from subscriptions where address=?''',
self.address)
if queryreturn: if queryreturn:
self.type = AccountMixin.SUBSCRIPTION self.type = AccountMixin.SUBSCRIPTION
@ -148,7 +153,8 @@ class BMAccount(object):
label, = row label, = row
else: else:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', address) '''select label from subscriptions where address=?''',
address)
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
label, = row label, = row
@ -208,8 +214,10 @@ class GatewayAccount(BMAccount):
def send(self): def send(self):
"""Override the send method for gateway accounts.""" """Override the send method for gateway accounts."""
# pylint: disable=unused-variable # pylint: disable=unused-variable
status, addressVersionNumber, streamNumber, ripe = decodeAddress(self.toAddress) status, addressVersionNumber, streamNumber, ripe = decodeAddress(
stealthLevel = BMConfigParser().safeGetInt('bitmessagesettings', 'ackstealthlevel') self.toAddress)
stealthLevel = BMConfigParser().safeGetInt(
'bitmessagesettings', 'ackstealthlevel')
ackdata = genAckPayload(streamNumber, stealthLevel) ackdata = genAckPayload(streamNumber, stealthLevel)
sqlExecute( sqlExecute(
'''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
@ -228,9 +236,9 @@ class GatewayAccount(BMAccount):
'sent', # folder 'sent', # folder
2, # encodingtype 2, # encodingtype
# not necessary to have a TTL higher than 2 days # not necessary to have a TTL higher than 2 days
min(BMConfigParser().getint('bitmessagesettings', 'ttl'), 86400 * 2) min(BMConfigParser().getint(
'bitmessagesettings', 'ttl'), 86400 * 2)
) )
queues.workerQueue.put(('sendmessage', self.toAddress)) queues.workerQueue.put(('sendmessage', self.toAddress))
@ -331,7 +339,8 @@ class MailchuckAccount(GatewayAccount):
def parseMessage(self, toAddress, fromAddress, subject, message): def parseMessage(self, toAddress, fromAddress, subject, message):
"""Parsemessage specific to a MailchuckAccount.""" """Parsemessage specific to a MailchuckAccount."""
super(MailchuckAccount, self).parseMessage(toAddress, fromAddress, subject, message) super(MailchuckAccount, self).parseMessage(
toAddress, fromAddress, subject, message)
if fromAddress == self.relayAddress: if fromAddress == self.relayAddress:
matches = self.regExpIncoming.search(subject) matches = self.regExpIncoming.search(subject)
if matches is not None: if matches is not None:
@ -352,6 +361,7 @@ class MailchuckAccount(GatewayAccount):
self.toLabel = matches.group(1) self.toLabel = matches.group(1)
self.toAddress = matches.group(1) self.toAddress = matches.group(1)
self.feedback = self.ALL_OK self.feedback = self.ALL_OK
if fromAddress == self.registrationAddress and self.subject == "Registration Request Denied": if fromAddress == self.registrationAddress \
and self.subject == "Registration Request Denied":
self.feedback = self.REGISTRATION_DENIED self.feedback = self.REGISTRATION_DENIED
return self.feedback return self.feedback