Skip to content

Commit 74b596c

Browse files
PeterSurdaPeterSurda
committed
Code quality
1 parent 871aea9 commit 74b596c

16 files changed

Lines changed: 142 additions & 152 deletions

‎setup.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ignore = bitmessagekivy
2424
[pylint.messages_control]
2525
disable =
2626
invalid-name,bare-except,broad-except,relative-import,
27-
superfluous-parens,bad-option-value
27+
superfluous-parens,bad-option-value,fixme
2828
# invalid-name: needs fixing during a large, project-wide refactor
2929
# bare-except,broad-except: Need fixing once thorough testing is easier
3030
# bad-option-value is for backward compatibility between python 2 and 3
@@ -42,7 +42,7 @@ ignore = bitmessagekivy
4242
[MESSAGES CONTROL]
4343
disable =
4444
invalid-name,bare-except,broad-except,relative-import,
45-
superfluous-parens,bad-option-value
45+
superfluous-parens,bad-option-value,fixme
4646

4747
[DESIGN]
4848
max-args = 8

‎src/bitmessageqt/__init__.py‎

Lines changed: 108 additions & 120 deletions
Large diffs are not rendered by default.

‎src/bitmessageqt/bitmessageui.py‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#
88
# WARNING! All changes made in this file will be lost!
99

10-
# pylint: disable=attribute-defined-outside-init
1110
from PyQt4 import QtCore, QtGui # pylint: disable=import-error
1211
from bmconfigparser import config
1312
from foldertree import AddressBookCompleter
@@ -57,6 +56,7 @@ def _translate(context, text, disambig,
5756

5857

5958
class Ui_MainWindow(object):
59+
# pylint: disable=attribute-defined-outside-init
6060
def setupUi(self, MainWindow):
6161
MainWindow.setObjectName(_fromUtf8("MainWindow"))
6262
MainWindow.resize(885, 580)
@@ -182,7 +182,8 @@ def setupUi(self, MainWindow):
182182
self.horizontalSplitter_3.setCollapsible(1, False)
183183
self.gridLayout.addWidget(self.horizontalSplitter_3)
184184
icon2 = QtGui.QIcon()
185-
icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/inbox.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
185+
icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/inbox.png")),
186+
QtGui.QIcon.Normal, QtGui.QIcon.Off)
186187
self.tabWidget.addTab(self.inbox, icon2, _fromUtf8(""))
187188
self.send = QtGui.QWidget()
188189
self.send.setObjectName(_fromUtf8("send"))
@@ -204,7 +205,8 @@ def setupUi(self, MainWindow):
204205
item = QtGui.QTableWidgetItem()
205206
icon3 = QtGui.QIcon()
206207
icon3.addPixmap(
207-
QtGui.QPixmap(_fromUtf8(":/newPrefix/images/addressbook.png")), QtGui.QIcon.Selected, QtGui.QIcon.Off
208+
QtGui.QPixmap(_fromUtf8(":/newPrefix/images/addressbook.png")),
209+
QtGui.QIcon.Selected, QtGui.QIcon.Off
208210
)
209211
item.setIcon(icon3)
210212
self.tableWidgetAddressBook.setHorizontalHeaderItem(0, item)
@@ -366,7 +368,8 @@ def setupUi(self, MainWindow):
366368
self.labelHumanFriendlyTTLDescription.setSizePolicy(sizePolicy)
367369
self.labelHumanFriendlyTTLDescription.setMinimumSize(QtCore.QSize(45, 0))
368370
self.labelHumanFriendlyTTLDescription.setObjectName(_fromUtf8("labelHumanFriendlyTTLDescription"))
369-
self.horizontalLayout_5.addWidget(self.labelHumanFriendlyTTLDescription, 1, QtCore.Qt.AlignLeft)
371+
self.horizontalLayout_5.addWidget(self.labelHumanFriendlyTTLDescription,
372+
1, QtCore.Qt.AlignLeft)
370373
self.pushButtonClear = QtGui.QPushButton(self.send)
371374
self.pushButtonClear.setObjectName(_fromUtf8("pushButtonClear"))
372375
self.horizontalLayout_5.addWidget(self.pushButtonClear, 0, QtCore.Qt.AlignRight)
@@ -388,7 +391,8 @@ def setupUi(self, MainWindow):
388391
self.horizontalSplitter.setCollapsible(1, False)
389392
self.gridLayout_7.addWidget(self.horizontalSplitter, 0, 0, 1, 1)
390393
icon4 = QtGui.QIcon()
391-
icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
394+
icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")),
395+
QtGui.QIcon.Normal, QtGui.QIcon.Off)
392396
self.tabWidget.addTab(self.send, icon4, _fromUtf8(""))
393397
self.subscriptions = QtGui.QWidget()
394398
self.subscriptions.setObjectName(_fromUtf8("subscriptions"))
@@ -691,7 +695,6 @@ def setupUi(self, MainWindow):
691695
MainWindow.setTabOrder(self.textEditMessage, self.pushButtonAddSubscription)
692696

693697
# Popup menu actions container for the Sent page
694-
# pylint: disable=attribute-defined-outside-init
695698
self.sentContextMenuToolbar = QtGui.QToolBar()
696699
# Popup menu actions container for chans tree
697700
self.addressContextMenuToolbar = QtGui.QToolBar()
@@ -739,7 +742,8 @@ def retranslateUi(self, MainWindow):
739742
self.label_2.setText(_translate("MainWindow", "From:", None))
740743
self.label.setText(_translate("MainWindow", "To:", None))
741744
self.tabWidgetSend.setTabText(
742-
self.tabWidgetSend.indexOf(self.sendDirect), _translate("MainWindow", "Send ordinary Message", None)
745+
self.tabWidgetSend.indexOf(self.sendDirect),
746+
_translate("MainWindow", "Send ordinary Message", None)
743747
)
744748
self.label_8.setText(_translate("MainWindow", "From:", None))
745749
self.label_7.setText(_translate("MainWindow", "Subject:", None))
@@ -822,17 +826,7 @@ def retranslateUi(self, MainWindow):
822826
self.actionRegenerateDeterministicAddresses.setText(
823827
_translate("MainWindow", "Regenerate deterministic addresses", None)
824828
)
825-
self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
829+
self.actionDeleteAllTrashedMessages.setText(
830+
_translate("MainWindow", "Delete all trashed messages", None))
826831
self.actionJoinChan.setText(_translate("MainWindow", "Join / Create chan", None))
827832
self.updateNetworkSwitchMenuLabel()
828-
829-
830-
if __name__ == "__main__":
831-
import sys
832-
833-
app = QtGui.QApplication(sys.argv)
834-
MainWindow = settingsmixin.SMainWindow()
835-
ui = Ui_MainWindow()
836-
ui.setupUi(MainWindow)
837-
MainWindow.show()
838-
sys.exit(app.exec_())

‎src/bitmessageqt/messagecompose.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Message editor with a wheel zoom functionality
33
"""
44

5-
from PyQt4 import QtCore, QtGui # pylint disable=import-error
5+
from PyQt4 import QtCore, QtGui # pylint: disable=import-error
66

77

88
class MessageCompose(QtGui.QTextEdit):

‎src/bitmessageqt/tests/test_widgets.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import sys
99
import unittest
1010

11+
# pylint: disable=import-outside-toplevel,unused-import
1112
try:
1213
from PyQt4 import QtCore, QtGui, QtTest
1314
has_qt = True

‎src/bitmessageqt/utils.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,9 @@ def avatarize(address):
105105
lower_default = state.appdata + 'avatars/' + 'default.' + ext.lower()
106106
upper_default = state.appdata + 'avatars/' + 'default.' + ext.upper()
107107
if os.path.isfile(lower_default):
108-
default = lower_default
109108
idcon.addFile(lower_default)
110109
return idcon
111110
elif os.path.isfile(upper_default):
112-
default = upper_default
113111
idcon.addFile(upper_default)
114112
return idcon
115113
# If no avatar is found

‎src/build_osx.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Building osx."""
22
import os
33
from glob import glob
4-
from PyQt4 import QtCore
4+
from PyQt4 import QtCore # pylint: disable=import-error
55
from setuptools import setup
66

77
name = "Bitmessage"

‎src/class_sqlThread.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import threading
1010
import time
1111

12+
# pylint: disable=import-error,redefined-builtin
1213
from six.moves.reprlib import repr
1314

1415
try:
@@ -34,8 +35,12 @@ class sqlThread(threading.Thread):
3435

3536
def __init__(self):
3637
threading.Thread.__init__(self, name="SQL")
38+
self.conn = None
39+
self.cur = None
3740

38-
def run(self): # pylint: disable=too-many-locals, too-many-branches, too-many-statements
41+
# pylint: disable=protected-access,too-many-locals
42+
# pylint: disable=too-many-branches,too-many-statements
43+
def run(self):
3944
"""Process SQL queries from `.helper_sql.sqlSubmitQueue`"""
4045
helper_sql.sql_available = True
4146
config_ready.wait()

‎src/helper_msgcoding.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def __init__(self, message, encoding=BITMESSAGE_ENCODING_SIMPLE):
5656
else:
5757
raise MsgEncodeException("Unknown encoding %i" % (encoding))
5858

59+
# pylint: disable=no-member
5960
def encodeExtended(self, message):
6061
"""Handle extended encoding"""
6162
try:
@@ -118,6 +119,7 @@ def decodeExtended(self, data):
118119

119120
try:
120121
tmp = msgpack.loads(tmp)
122+
# pylint: disable=no-member
121123
except (msgpack.exceptions.UnpackException,
122124
msgpack.exceptions.ExtraData):
123125
logger.error("Error msgunpacking message")

‎src/main-android-live.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import state
44
import sys
55
from bitmessagemain import main
6-
from termcolor import colored
6+
from termcolor import colored # pylint: disable=import-error
77
print(colored('kivy is not supported at the moment for this version..',
88
'red'))
99
sys.exit()

0 commit comments

Comments
 (0)