Skip to content

Commit 885df49

Browse files
ruanLNJefferson Stachelski
authored and
Jefferson Stachelski
committed
passing in pep8
1 parent fd12de6 commit 885df49

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Diff for: gpg_group_chat/client/client.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@
33
import sys
44
import threading
55

6+
67
class Client():
78

89
def __init__(self):
910
self._socket = None
1011
self._connected = False
1112
self._nickname = 'anonymous'
1213

13-
def start(self, server_ip, server_port, nickname = None):
14-
if nickname != None:
14+
def start(self, server_ip, server_port, nickname=None):
15+
if nickname is not None:
1516
self._nickname = nickname
1617
print('Hello friend ' + self._nickname)
1718
dest = (server_ip, server_port)
1819
try:
1920
self._socket = socket.create_connection(dest)
2021
except:
2122
print('error opening socket')
22-
return;
23+
return
2324
self.__handle_messages()
2425

2526
def __start_protocol(self):
@@ -43,20 +44,19 @@ def __handle_messages(self):
4344
socket_list = [sys.stdin, self._socket]
4445
self.__prompt()
4546
while True:
46-
ready_to_read,ready_to_write,in_error = select.select(socket_list , [], [])
47+
ready_to_read, _, _ = select.select(socket_list, [], [])
4748
for sock in ready_to_read:
4849
if sock == self._socket:
4950
# incoming message from remote server
5051
data = sock.recv(4096)
51-
if not data :
52+
if not data:
5253
print('\nDisconnected from chat server')
5354
sys.exit()
54-
else :
55-
#print data
55+
else:
56+
# print data
5657
sys.stdout.write(data.decode('utf-8'))
5758
self.__prompt()
58-
59-
else :
59+
else:
6060
# user entered a message
6161
msg = sys.stdin.readline()
6262
msg = '['+self._nickname+'] ' + msg
@@ -68,6 +68,6 @@ def __prompt():
6868
sys.stdout.write('[Me] ')
6969
sys.stdout.flush()
7070

71-
def __gpg_encrypt(self,msg):
71+
def __gpg_encrypt(self, msg):
7272
return msg
7373
sys.stdout.flush()

Diff for: gpg_group_chat/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
def show_help():
2-
print('Helper will be available soon!')
2+
print('Helper will be available soon!')

0 commit comments

Comments
 (0)