Runnable with both Python3 and Python2, with PyQt4 #2249

Open
kashikoibumi wants to merge 60 commits from kashikoibumi/py3 into v0.6
Showing only changes of commit a6e980df2c - Show all commits

View File

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