diff --git a/src/network/asyncore_pollchoose.py b/src/network/asyncore_pollchoose.py index cbe0fa25..bdd312c6 100644 --- a/src/network/asyncore_pollchoose.py +++ b/src/network/asyncore_pollchoose.py @@ -972,8 +972,8 @@ if os.name == 'posix': def getsockopt(self, level, optname, buflen=None): """Fake getsockopt()""" - if (level == socket.SOL_SOCKET and optname == socket.SO_ERROR and - not buflen): + if (level == socket.SOL_SOCKET and optname == socket.SO_ERROR + and not buflen): return 0 raise NotImplementedError( "Only asyncore specific behaviour implemented.") diff --git a/src/network/objectracker.py b/src/network/objectracker.py index ca29c023..65e06de4 100644 --- a/src/network/objectracker.py +++ b/src/network/objectracker.py @@ -107,8 +107,8 @@ class ObjectTracker(object): del i.objectsNewToMe[hashid] except KeyError: if streamNumber in i.streams and ( - not Dandelion().hasHash(hashid) or - Dandelion().objectChildStem(hashid) == i): + not Dandelion().hasHash(hashid) + or Dandelion().objectChildStem(hashid) == i): with i.objectsNewToThemLock: i.objectsNewToThem[hashid] = time.time() # update stream number,