diff --git a/src/netnode.py b/src/netnode.py --- a/src/netnode.py +++ b/src/netnode.py @@ -7,7 +7,7 @@ from networkers import NetworkReader,Net from hashtree import HashTree -lockFile=os.path.join(conf.directory,"dirty.lock") +lockFile = os.path.join(conf.directory,"dirty.lock") class FailedConnection(Exception): pass @@ -17,19 +17,19 @@ class IncompatibleException(Exception): class BaseConnection: # abstract def __init__(self): - self._socket=None - self.incoming=None - self.outcoming=None + self._socket = None + self.incoming = None + self.outcoming = None def createNetworkers(self): - fr=self._socket.makefile(mode="rb") - fw=self._socket.makefile(mode="wb") + fr = self._socket.makefile(mode="rb") + fw = self._socket.makefile(mode="wb") - self.incoming=NetworkReader(fr) - self.outcoming=NetworkWriter(fw) + self.incoming = NetworkReader(fr) + self.outcoming = NetworkWriter(fw) def __enter__(self): - return self.incoming,self.outcoming + return self.incoming, self.outcoming def __exit__(self, exc_type, exc_val, exc_tb): try: @@ -40,26 +40,26 @@ class BaseConnection: # abstract class NetNode: - def __init__(self,filename,treeFile=""): - self._incoming=None - self._outcoming=None + def __init__(self, filename, treeFile=""): + self._incoming = None + self._outcoming = None - self._filename=filename - self._treeFile=treeFile + self._filename = filename + self._treeFile = treeFile if treeFile: - self._tree=HashTree.load(treeFile) + self._tree = HashTree.load(treeFile) else: - self._tree=HashTree.fromFile(filename) + self._tree = HashTree.fromFile(filename) - self._newLeaves=dict() + self._newLeaves = dict() def isLocked(self): return os.path.isfile(lockFile) def _lock(self): try: - f=open(lockFile,"x") + f = open(lockFile,"x") f.close() except FileExistsError: raise LockedException()