Merge pull request #24 from jaicis/py3convert

Updated the branch by origin and added changes on the knownNodes file
This commit is contained in:
jaicis 2020-01-10 15:26:17 +05:30 committed by GitHub
commit 3ac7076836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View File

@ -1,15 +1,21 @@
astroid==2.3.3
certifi==2019.9.11 certifi==2019.9.11
chardet==3.0.4 chardet==3.0.4
docutils==0.15.2 docutils==0.15.2
idna==2.8 idna==2.8
isort==4.3.21
Kivy==1.11.1 Kivy==1.11.1
Kivy-Garden==0.1.4 Kivy-Garden==0.1.4
kivymd==0.100.2 git+https://github.com/HeaTTheatR/KivyMD.git
lazy-object-proxy==1.4.3
mccabe==0.6.1
Pillow==6.1.0 Pillow==6.1.0
pkg-resources==0.0.0 pkg-resources==0.0.0
pydenticon==0.3.1 pydenticon==0.3.1
Pygments==2.4.2 Pygments==2.4.2
pylint==2.4.4
qrcode==6.1 qrcode==6.1
requests==2.22.0 requests==2.22.0
six==1.12.0 six==1.12.0
typed-ast==1.4.0
urllib3==1.25.6 urllib3==1.25.6

View File

@ -114,14 +114,14 @@ def createDefaultKnownNodes():
def readKnownNodes(): def readKnownNodes():
"""Load knownnodes from filesystem""" """Load knownnodes from filesystem"""
try: try:
with open(state.appdata + 'knownnodes.dat', 'r') as source: with open(state.appdata + 'knownnodes.dat', 'rb') as source:
with knownNodesLock: with knownNodesLock:
try: try:
json_deserialize_knownnodes(source) json_deserialize_knownnodes(source)
except ValueError: except ValueError:
source.seek(0) source.seek(0)
pickle_deserialize_old_knownnodes(source) pickle_deserialize_old_knownnodes(source)
except (IOError, OSError, KeyError, EOFError): except (IOError, OSError, KeyError, EOFError,pickle.UnpicklingError):
logger.debug( logger.debug(
'Failed to read nodes from knownnodes.dat', exc_info=True) 'Failed to read nodes from knownnodes.dat', exc_info=True)
createDefaultKnownNodes() createDefaultKnownNodes()

View File

@ -472,7 +472,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
addresses = self._decode_addr() # pylint: disable=redefined-outer-name addresses = self._decode_addr() # pylint: disable=redefined-outer-name
for i in addresses: for i in addresses:
seenTime, stream, _, ip, port = i seenTime, stream, _, ip, port = i
decodedIP = protocol.checkIPAddress(ip) decodedIP = protocol.checkIPAddress(bytes(ip))
if stream not in state.streamsInWhichIAmParticipating: if stream not in state.streamsInWhichIAmParticipating:
continue continue
if ( if (