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

Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 127 commits from kashikoibumi/py3qt into v0.6
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 127 Files Changed 179 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6e980df2c - Show all commits

3
src/network/dandelion.py
View File

@ -7,6 +7,7 @@ from random import choice, expovariate, sample
from threading import RLock from threading import RLock
from time import time from time import time
import six import six
from binascii import hexlify
import network.connectionpool # use long name to address recursive import import network.connectionpool # use long name to address recursive import
import state import state
@ -76,7 +77,7 @@ class Dandelion: # pylint: disable=old-style-class
if logger.isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
logger.debug( logger.debug(
'%s entering fluff mode due to %s.', '%s entering fluff mode due to %s.',
''.join('%02x' % six.byte2int(i) for i in hashId), reason) hexlify(hashId), reason)
with self.lock: with self.lock:
try: try:
del self.hashMap[bytes(hashId)] del self.hashMap[bytes(hashId)]