diff --git a/src/client.py b/src/client.py --- a/src/client.py +++ b/src/client.py @@ -12,10 +12,10 @@ from networkers import NetworkReader,Net class Connection: def __init__(self): - self.socket=socket.socket(socket.AF_INET,socket.SOCK_STREAM) - self.socket.connect((conf.hosts[0], conf.port)) - fr=self.socket.makefile(mode="rb") - fw=self.socket.makefile(mode="wb") + self._socket=socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self._socket.connect((conf.hosts[0], conf.port)) + fr=self._socket.makefile(mode="rb") + fw=self._socket.makefile(mode="wb") self.incoming=NetworkReader(fr) self.outcoming=NetworkWriter(fw) @@ -24,16 +24,16 @@ class Connection: return self.incoming,self.outcoming def __exit__(self, exc_type, exc_val, exc_tb): - self.socket.close() + self._socket.close() class Client: def __init__(self,filename): - self.filename=filename + self._filename=filename def negotiate(self): print(datetime.now(), "initializing...") - localTree=HashTree.fromFile(self.filename) + localTree=HashTree.fromFile(self._filename) blocksToTransfer=[] nodeStack=collections.deque([0]) # root @@ -69,7 +69,7 @@ class Client: def sendData(self,blocksToTransfer): log.info(blocksToTransfer) - dataFile=open(self.filename,mode="rb") + dataFile=open(self._filename, mode="rb") i1=-1 print(datetime.now(), "sending data:")