Skip to content

Commit d1e50e3

Browse files
committed
Code quality
1 parent 58b1759 commit d1e50e3

19 files changed

Lines changed: 64 additions & 349 deletions

src/bitmessageqt/bitmessageui.py

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,34 @@ def _fromUtf8(s):
2525
try:
2626
_encoding = QtGui.QApplication.UnicodeUTF8
2727

28-
def _translate(context, text, disambig, encoding=QtCore.QCoreApplication.CodecForTr, n=None):
28+
# pylint: disable=unused-argument
29+
def _translate(context, text, disambig,
30+
encoding=QtCore.QCoreApplication.CodecForTr, n=None):
2931
if n is None:
30-
return QtGui.QApplication.translate(context, text, disambig, _encoding)
32+
return QtGui.QApplication.translate(context,
33+
text,
34+
disambig,
35+
_encoding)
3136
else:
32-
return QtGui.QApplication.translate(context, text, disambig, _encoding, n)
37+
return QtGui.QApplication.translate(context,
38+
text,
39+
disambig,
40+
_encoding,
41+
n)
3342
except AttributeError:
34-
def _translate(context, text, disambig, encoding=QtCore.QCoreApplication.CodecForTr, n=None):
43+
# pylint: disable=unused-argument
44+
def _translate(context, text, disambig,
45+
encoding=QtCore.QCoreApplication.CodecForTr, n=None):
3546
if n is None:
36-
return QtGui.QApplication.translate(context, text, disambig)
47+
return QtGui.QApplication.translate(context,
48+
text,
49+
disambig)
3750
else:
38-
return QtGui.QApplication.translate(context, text, disambig, QtCore.QCoreApplication.CodecForTr, n)
51+
return QtGui.QApplication.translate(context,
52+
text,
53+
disambig,
54+
QtCore.QCoreApplication.CodecForTr,
55+
n)
3956

4057

4158
class Ui_MainWindow(object):
@@ -44,7 +61,8 @@ def setupUi(self, MainWindow):
4461
MainWindow.resize(885, 580)
4562
icon = QtGui.QIcon()
4663
icon.addPixmap(
47-
QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off
64+
QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")),
65+
QtGui.QIcon.Normal, QtGui.QIcon.Off
4866
)
4967
MainWindow.setWindowIcon(icon)
5068
MainWindow.setTabShape(QtGui.QTabWidget.Rounded)
@@ -53,7 +71,8 @@ def setupUi(self, MainWindow):
5371
self.gridLayout_10 = QtGui.QGridLayout(self.centralwidget)
5472
self.gridLayout_10.setObjectName(_fromUtf8("gridLayout_10"))
5573
self.tabWidget = QtGui.QTabWidget(self.centralwidget)
56-
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
74+
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
75+
QtGui.QSizePolicy.Expanding)
5776
sizePolicy.setHorizontalStretch(0)
5877
sizePolicy.setVerticalStretch(0)
5978
sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())
@@ -78,7 +97,7 @@ def setupUi(self, MainWindow):
7897
self.verticalSplitter_12.setOrientation(QtCore.Qt.Vertical)
7998
self.treeWidgetYourIdentities = settingsmixin.STreeWidget(self.inbox)
8099
self.treeWidgetYourIdentities.setObjectName(_fromUtf8("treeWidgetYourIdentities"))
81-
self.treeWidgetYourIdentities.resize(200, self.treeWidgetYourIdentities.height())
100+
self.treeWidgetYourIdentities.resize(200,self.treeWidgetYourIdentities.height())
82101
icon1 = QtGui.QIcon()
83102
icon1.addPixmap(
84103
QtGui.QPixmap(_fromUtf8(":/newPrefix/images/identities.png")), QtGui.QIcon.Selected, QtGui.QIcon.Off

src/depends.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def try_import(module, log_extra=False):
188188
logger.error(
189189
'On %s, try running "%s %s" as root.',
190190
dist, PACKAGE_MANAGER[dist], PACKAGES[module][dist])
191-
return False
191+
return None
192192

193193

194194
def check_ripemd160():
@@ -274,6 +274,7 @@ def check_openssl():
274274
if sys.platform == 'win32':
275275
paths = ['libeay32.dll']
276276
if getattr(sys, 'frozen', False):
277+
# pylint: disable=no-member
277278
paths.insert(0, os.path.join(sys._MEIPASS, 'libeay32.dll'))
278279
else:
279280
paths = ['libcrypto.so', 'libcrypto.so.1.0.0']

src/fallback/umsgpack/umsgpack.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@ def _pack2(obj, fp, **options):
410410
>>> umsgpack.pack({u"compact": True, u"schema": 0}, f)
411411
>>>
412412
"""
413-
global compatibility
414-
415413
ext_handlers = options.get("ext_handlers")
416414

417415
if obj is None:
@@ -480,8 +478,6 @@ def _pack3(obj, fp, **options):
480478
>>> umsgpack.pack({u"compact": True, u"schema": 0}, f)
481479
>>>
482480
"""
483-
global compatibility
484-
485481
ext_handlers = options.get("ext_handlers")
486482

487483
if obj is None:
@@ -665,7 +661,6 @@ def _unpack_string(code, fp, options):
665661
raise Exception("logic error, not string: 0x%02x" % ord(code))
666662

667663
# Always return raw bytes in compatibility mode
668-
global compatibility
669664
if compatibility:
670665
return _read_except(fp, length)
671666

src/network/bmproto.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,25 @@ def __init__(self, address=None, sock=None):
6767
# track port check requests, only allow one per connection
6868
# completely disable port checks for now
6969
self.portCheckRequested = True
70+
self.payloadLength = 0
71+
self.payloadOffset = 0
72+
self.invalid = False
73+
self.timeOffset = 0
74+
self.verackSent = False
75+
self.verackReceived = False
76+
self.payload = None
77+
self.isSSL = False
78+
self.remoteProtocolVersion = 0
79+
self.nonce = 0
80+
self.peerNode = None
81+
self.streams = None
82+
self.timestamp = 0
83+
self.object = None
84+
self.services = None
85+
self.sockNode = None
86+
self.magic = None
87+
self.checksum = None
88+
self.command = None
7089

7190
def bm_proto_reset(self):
7291
"""Reset the bitmessage object parser"""

src/network/http.py

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/network/httpd.py

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)