Skip to content

Commit a1bf59d

Browse files
PeterSurdaPeterSurda
committed
Code quality
1 parent 8a7c78b commit a1bf59d

15 files changed

Lines changed: 76 additions & 49 deletions

File tree

‎checkdeps.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757

5858

5959
def detectPrereqs(missing=True):
60+
"""Detect which required modules are present or absent"""
6061
available = []
6162
for module in PACKAGES:
6263
try:
@@ -70,6 +71,7 @@ def detectPrereqs(missing=True):
7071

7172

7273
def prereqToPackages():
74+
"""Map python modules to package names"""
7375
if not detectPrereqs():
7476
return
7577
print("%s %s" % (
@@ -78,13 +80,15 @@ def prereqToPackages():
7880

7981

8082
def compilerToPackages():
83+
"""Map compiler to package name"""
8184
if not detectOS() in COMPILING:
8285
return
8386
print("%s %s" % (
8487
PACKAGE_MANAGER[detectOS.result], COMPILING[detectOS.result]))
8588

8689

8790
def testCompiler():
91+
"""Check if compiler can build C PoW library"""
8892
if not HAVE_SETUPTOOLS:
8993
# silent, we can't test without setuptools
9094
return True
@@ -141,9 +145,9 @@ def testCompiler():
141145
if OPSYS is None:
142146
break
143147
if rhs and any([
144-
EXTRAS_REQUIRE_DEPS[x][OPSYS]
145-
for x in rhs
146-
if x in EXTRAS_REQUIRE_DEPS
148+
EXTRAS_REQUIRE_DEPS[x][OPSYS]
149+
for x in rhs
150+
if x in EXTRAS_REQUIRE_DEPS
147151
]):
148152
try:
149153
import_module(lhs)

‎docs/conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
http://www.sphinx-doc.org/en/master/config
77
"""
88

9+
# flake8: noqa:E402
10+
911
import os
1012
import sys
1113

‎packages/collectd/pybitmessagestatus.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ def read_callback():
6161
metric.dispatch()
6262

6363

64+
def main():
65+
"""Dummy function"""
66+
pass
67+
68+
6469
if __name__ == "__main__":
6570
main()
6671
else:

‎setup.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
[pycodestyle]
77
max-line-length = 119
8+
ignore = E402,E722,W503
89

910
[flake8]
1011
max-line-length = 119
@@ -17,7 +18,7 @@ ignore = E722,F841,W503
1718
# pylint honours the [MESSAGES CONTROL] section
1819
# as well as [MASTER] section
1920
[MESSAGES CONTROL]
20-
disable=invalid-name,bare-except,broad-except
21+
disable=invalid-name,bare-except,broad-except,superfluous-parens
2122
# invalid-name: needs fixing during a large, project-wide refactor
2223
# bare-except,broad-except: Need fixing once thorough testing is easier
2324
max-args = 8

‎setup.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python2.7
2+
"""Setuptools script for building and installing PyBitmessage"""
23

34
import os
45
import platform
@@ -111,18 +112,18 @@ def run(self):
111112

112113
data_files = [
113114
('share/applications/',
114-
['desktop/pybitmessage.desktop']),
115+
['desktop/pybitmessage.desktop']),
115116
('share/icons/hicolor/scalable/apps/',
116-
['desktop/icons/scalable/pybitmessage.svg']),
117+
['desktop/icons/scalable/pybitmessage.svg']),
117118
('share/icons/hicolor/24x24/apps/',
118-
['desktop/icons/24x24/pybitmessage.png'])
119+
['desktop/icons/24x24/pybitmessage.png'])
119120
]
120121

121122
try:
122123
if platform.dist()[0] in ('Debian', 'Ubuntu'):
123124
data_files += [
124125
("etc/apparmor.d/",
125-
['packages/apparmor/pybitmessage'])
126+
['packages/apparmor/pybitmessage'])
126127
]
127128
except AttributeError:
128129
pass # FIXME: use distro for more recent python

‎src/bitmessagecurses/__init__.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ def drawtab(stdscr):
252252
# Connection data
253253
connected_hosts = network.stats.connectedHostsList()
254254
stdscr.addstr(
255-
4, 5, "Total Connections: " +
256-
str(len(connected_hosts)).ljust(2)
255+
4, 5, "Total Connections: "
256+
+ str(len(connected_hosts)).ljust(2)
257257
)
258258
stdscr.addstr(6, 6, "Stream #", curses.A_BOLD)
259259
stdscr.addstr(6, 18, "Connections", curses.A_BOLD)
@@ -350,13 +350,13 @@ def handlech(c, stdscr):
350350
if t == "1": # View
351351
set_background_title(
352352
d,
353-
"\"" +
354-
inbox[inboxcur][5] +
355-
"\" from \"" +
356-
inbox[inboxcur][3] +
357-
"\" to \"" +
358-
inbox[inboxcur][1] +
359-
"\"")
353+
"\""
354+
+ inbox[inboxcur][5]
355+
+ "\" from \""
356+
+ inbox[inboxcur][3]
357+
+ "\" to \""
358+
+ inbox[inboxcur][1]
359+
+ "\"")
360360
data = "" # pyint: disable=redefined-outer-name
361361
ret = sqlQuery("SELECT message FROM inbox WHERE msgid=?", inbox[inboxcur][0])
362362
if ret != []:
@@ -453,13 +453,13 @@ def handlech(c, stdscr):
453453
if t == "1": # View
454454
set_background_title(
455455
d,
456-
"\"" +
457-
sentbox[sentcur][4] +
458-
"\" from \"" +
459-
sentbox[sentcur][3] +
460-
"\" to \"" +
461-
sentbox[sentcur][1] +
462-
"\"")
456+
"\""
457+
+ sentbox[sentcur][4]
458+
+ "\" from \""
459+
+ sentbox[sentcur][3]
460+
+ "\" to \""
461+
+ sentbox[sentcur][1]
462+
+ "\"")
463463
data = ""
464464
ret = sqlQuery(
465465
"SELECT message FROM sent WHERE subject=? AND ackdata=?",
@@ -949,11 +949,11 @@ def sendMessage(sender="", recv="", broadcast=None, subject="", body="", reply=F
949949
if version > 4 or version <= 1:
950950
set_background_title(d, "Recipient address error")
951951
scrollbox(d, unicode(
952-
"Could not understand version number " +
953-
version +
954-
"of address" +
955-
addr +
956-
"."))
952+
"Could not understand version number "
953+
+ version
954+
+ " of address "
955+
+ addr
956+
+ "."))
957957
continue
958958
if stream > 1 or stream == 0:
959959
set_background_title(d, "Recipient address error")

‎src/bitmessageqt/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,7 @@ def rerenderComboBoxSendFrom(self):
23992399
i, AccountColor(address).accountColor(),
24002400
QtCore.Qt.ForegroundRole)
24012401
self.ui.comboBoxSendFrom.insertItem(0, '', '')
2402-
if(self.ui.comboBoxSendFrom.count() == 2):
2402+
if self.ui.comboBoxSendFrom.count() == 2:
24032403
self.ui.comboBoxSendFrom.setCurrentIndex(1)
24042404
else:
24052405
self.ui.comboBoxSendFrom.setCurrentIndex(0)
@@ -2422,7 +2422,7 @@ def rerenderComboBoxSendFromBroadcast(self):
24222422
i, AccountColor(address).accountColor(),
24232423
QtCore.Qt.ForegroundRole)
24242424
self.ui.comboBoxSendFromBroadcast.insertItem(0, '', '')
2425-
if(self.ui.comboBoxSendFromBroadcast.count() == 2):
2425+
if self.ui.comboBoxSendFromBroadcast.count() == 2:
24262426
self.ui.comboBoxSendFromBroadcast.setCurrentIndex(1)
24272427
else:
24282428
self.ui.comboBoxSendFromBroadcast.setCurrentIndex(0)

‎src/bitmessageqt/bitmessage_icons_rc.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,10 +1666,15 @@
16661666
\x00\x00\x01\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x34\xdf\
16671667
"
16681668

1669+
16691670
def qInitResources():
1670-
QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
1671+
QtCore.qRegisterResourceData(0x01, qt_resource_struct,
1672+
qt_resource_name, qt_resource_data)
1673+
16711674

16721675
def qCleanupResources():
1673-
QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
1676+
QtCore.qUnregisterResourceData(0x01, qt_resource_struct,
1677+
qt_resource_name, qt_resource_data)
1678+
16741679

16751680
qInitResources()

‎src/bitmessageqt/blacklist.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def __init__(self, parent=None):
2222
QtCore.QObject.connect(self.radioButtonWhitelist, QtCore.SIGNAL(
2323
"clicked()"), self.click_radioButtonWhitelist)
2424
QtCore.QObject.connect(self.pushButtonAddBlacklist, QtCore.SIGNAL(
25-
"clicked()"), self.click_pushButtonAddBlacklist)
25+
"clicked()"), self.click_pushButtonAddBlacklist)
2626

2727
self.init_blacklist_popup_menu()
2828

@@ -31,7 +31,7 @@ def __init__(self, parent=None):
3131
"itemChanged(QTableWidgetItem *)"), self.tableWidgetBlacklistItemChanged)
3232

3333
# Set the icon sizes for the identicons
34-
identicon_size = 3*7
34+
identicon_size = 3 * 7
3535
self.tableWidgetBlacklist.setIconSize(QtCore.QSize(identicon_size, identicon_size))
3636

3737
self.UISignalThread = UISignaler.get()
@@ -69,7 +69,7 @@ def click_pushButtonAddBlacklist(self):
6969
sql = '''select * from blacklist where address=?'''
7070
else:
7171
sql = '''select * from whitelist where address=?'''
72-
queryreturn = sqlQuery(sql,*t)
72+
queryreturn = sqlQuery(sql, *t)
7373
if queryreturn == []:
7474
self.tableWidgetBlacklist.setSortingEnabled(False)
7575
self.tableWidgetBlacklist.insertRow(0)
@@ -111,10 +111,10 @@ def tableWidgetBlacklistItemChanged(self, item):
111111
if isinstance(addressitem, QtGui.QTableWidgetItem):
112112
if self.radioButtonBlacklist.isChecked():
113113
sqlExecute('''UPDATE blacklist SET label=? WHERE address=?''',
114-
str(item.text()), str(addressitem.text()))
114+
str(item.text()), str(addressitem.text()))
115115
else:
116116
sqlExecute('''UPDATE whitelist SET label=? WHERE address=?''',
117-
str(item.text()), str(addressitem.text()))
117+
str(item.text()), str(addressitem.text()))
118118

119119
def init_blacklist_popup_menu(self, connectSignal=True):
120120
# Popup menu for the Blacklist page
@@ -145,7 +145,7 @@ def init_blacklist_popup_menu(self, connectSignal=True):
145145
if connectSignal:
146146
self.connect(self.tableWidgetBlacklist, QtCore.SIGNAL(
147147
'customContextMenuRequested(const QPoint&)'),
148-
self.on_context_menuBlacklist)
148+
self.on_context_menuBlacklist)
149149
self.popMenuBlacklist = QtGui.QMenu(self)
150150
# self.popMenuBlacklist.addAction( self.actionBlacklistNew )
151151
self.popMenuBlacklist.addAction(self.actionBlacklistDelete)

‎src/bitmessageqt/uisignaler.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ def run(self):
4040
elif command == 'displayNewInboxMessage':
4141
inventoryHash, toAddress, fromAddress, subject, body = data
4242
self.emit(SIGNAL(
43-
"displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
43+
"displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,"
44+
"PyQt_PyObject,PyQt_PyObject)"),
4445
inventoryHash, toAddress, fromAddress, subject, body)
4546
elif command == 'displayNewSentMessage':
4647
toAddress, fromLabel, fromAddress, subject, message, ackdata = data
4748
self.emit(SIGNAL(
48-
"displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
49+
"displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,"
50+
"PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
4951
toAddress, fromLabel, fromAddress, subject, message, ackdata)
5052
elif command == 'updateNetworkStatusTab':
5153
outbound, add, destination = data

0 commit comments

Comments
 (0)