From 885df49cab86d7ae64b9743fe7185c5eb87b0143 Mon Sep 17 00:00:00 2001 From: rlnunes Date: Thu, 28 Jul 2016 01:08:47 -0300 Subject: [PATCH] passing in pep8 --- gpg_group_chat/client/client.py | 20 ++++++++++---------- gpg_group_chat/utils.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gpg_group_chat/client/client.py b/gpg_group_chat/client/client.py index e25660b..278a183 100644 --- a/gpg_group_chat/client/client.py +++ b/gpg_group_chat/client/client.py @@ -3,6 +3,7 @@ import sys import threading + class Client(): def __init__(self): @@ -10,8 +11,8 @@ def __init__(self): 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) @@ -19,7 +20,7 @@ def start(self, server_ip, server_port, nickname = None): self._socket = socket.create_connection(dest) except: print('error opening socket') - return; + return self.__handle_messages() def __start_protocol(self): @@ -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 @@ -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() diff --git a/gpg_group_chat/utils.py b/gpg_group_chat/utils.py index 1187a26..7da6e4a 100644 --- a/gpg_group_chat/utils.py +++ b/gpg_group_chat/utils.py @@ -1,2 +1,2 @@ def show_help(): - print('Helper will be available soon!') + print('Helper will be available soon!')