Skip to content

Commit

Permalink
passing in pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
ruanLN authored and Jefferson Stachelski committed Jul 28, 2016
1 parent fd12de6 commit 885df49
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions gpg_group_chat/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
import sys
import threading


class Client():

def __init__(self):
self._socket = None
self._connected = False
self._nickname = 'anonymous'

def start(self, server_ip, server_port, nickname = None):
if nickname != None:
def start(self, server_ip, server_port, nickname=None):
if nickname is not None:
self._nickname = nickname
print('Hello friend ' + self._nickname)
dest = (server_ip, server_port)
try:
self._socket = socket.create_connection(dest)
except:
print('error opening socket')
return;
return
self.__handle_messages()

def __start_protocol(self):
Expand All @@ -43,20 +44,19 @@ def __handle_messages(self):
socket_list = [sys.stdin, self._socket]
self.__prompt()
while True:
ready_to_read,ready_to_write,in_error = select.select(socket_list , [], [])
ready_to_read, _, _ = select.select(socket_list, [], [])
for sock in ready_to_read:
if sock == self._socket:
# incoming message from remote server
data = sock.recv(4096)
if not data :
if not data:
print('\nDisconnected from chat server')
sys.exit()
else :
#print data
else:
# print data
sys.stdout.write(data.decode('utf-8'))
self.__prompt()

else :
else:
# user entered a message
msg = sys.stdin.readline()
msg = '['+self._nickname+'] ' + msg
Expand All @@ -68,6 +68,6 @@ def __prompt():
sys.stdout.write('[Me] ')
sys.stdout.flush()

def __gpg_encrypt(self,msg):
def __gpg_encrypt(self, msg):
return msg
sys.stdout.flush()
2 changes: 1 addition & 1 deletion gpg_group_chat/utils.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
def show_help():
print('Helper will be available soon!')
print('Helper will be available soon!')

0 comments on commit 885df49

Please sign in to comment.