Skip to content

Commit 72ae3c2

Browse files
committed
Refactoring. Using black code style
1 parent e2fc942 commit 72ae3c2

File tree

10 files changed

+100
-107
lines changed

10 files changed

+100
-107
lines changed
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

7+
import pickle
78
import socket
9+
10+
811
sock = socket.socket()
9-
sock.connect(('localhost', 9090))
12+
sock.connect(("localhost", 9090))
1013

1114
obj = {
12-
'a': 1,
13-
'b': [2, 3],
14-
'c': {
15-
'c1': 'abc',
16-
}
15+
"a": 1,
16+
"b": [2, 3],
17+
"c": {
18+
"c1": "abc",
19+
},
1720
}
1821

19-
print('Send:', obj)
22+
print("Send:", obj)
2023

21-
import pickle
2224
data = pickle.dumps(obj)
23-
2425
sock.sendall(data)
2526

26-
print('Close')
27+
print("Close")
2728
sock.close()
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

77
import pickle
8+
import socket
89

9-
BUFFER_SIZE = 4096
1010

11+
BUFFER_SIZE = 4096
1112

12-
import socket
1313
sock = socket.socket()
14-
sock.bind(('', 9090))
14+
sock.bind(("", 9090))
1515
sock.listen()
1616

17-
print('Sock name: {}'.format(sock.getsockname()))
17+
print("Sock name: {}".format(sock.getsockname()))
1818

1919
while True:
2020
conn, addr = sock.accept()
21-
print('Connected:', addr)
21+
print("Connected:", addr)
2222

2323
all_data = bytearray()
2424

@@ -27,12 +27,12 @@
2727
if not data:
2828
break
2929

30-
print('Recv: {}: {}'.format(len(data), data))
30+
print("Recv: {}: {}".format(len(data), data))
3131
all_data += data
3232

33-
print('All data ({}): {}'.format(len(all_data), all_data))
33+
print("All data ({}): {}".format(len(all_data), all_data))
3434
obj = pickle.loads(all_data)
35-
print('Obj:', obj)
35+
print("Obj:", obj)
3636

37-
print('Close')
37+
print("Close")
3838
conn.close()
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

77
import socket
88

99
import sys
10-
sys.path.append('..')
11-
10+
sys.path.append("..")
1211
from common import send_msg, recv_msg
1312

1413

@@ -19,17 +18,17 @@
1918
sock.connect((HOST, PORT))
2019

2120
# Send file
22-
with open('img.png', 'rb') as f:
21+
with open("img.png", "rb") as f:
2322
data = f.read()
2423

25-
print('Sending ({}): {}'.format(len(data), data))
24+
print("Sending ({}): {}".format(len(data), data))
2625
print()
2726

2827
send_msg(sock, data)
2928

30-
print('Receiving')
29+
print("Receiving")
3130

3231
response_data = recv_msg(sock)
33-
print('Response ({}): {}'.format(len(response_data), response_data))
32+
print("Response ({}): {}".format(len(response_data), response_data))
3433

35-
print('Close\n')
34+
print("Close\n")
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

77
import socket
88

99
import sys
10-
sys.path.append('..')
11-
10+
sys.path.append("..")
1211
from common import send_msg, recv_msg
1312

1413

1514
PORT = 9090
1615

1716

1817
with socket.socket() as sock:
19-
sock.bind(('', PORT))
18+
sock.bind(("", PORT))
2019
sock.listen()
2120

22-
print('Server: {}'.format(sock.getsockname()))
21+
print("Server: {}".format(sock.getsockname()))
2322

2423
while True:
2524
conn, addr = sock.accept()
26-
print('Connected:', addr)
25+
print("Connected:", addr)
2726

2827
data = recv_msg(conn)
29-
print('Receiving ({}): {}'.format(len(data), data))
28+
print("Receiving ({}): {}".format(len(data), data))
3029

31-
text = 'Ok! Message size: {}'.format(len(data))
32-
print('Sending: {}'.format(text))
30+
text = "Ok! Message size: {}".format(len(data))
31+
print("Sending: {}".format(text))
3332

34-
rs = bytes(text, 'utf-8')
33+
rs = bytes(text, "utf-8")
3534
send_msg(conn, rs)
3635

37-
print('Close\n')
36+
print("Close\n")
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

77
import socket
88

99
import sys
10-
sys.path.append('..')
11-
10+
sys.path.append("..")
1211
from common import send_msg__with_crc32, recv_msg__with_crc32
1312

1413

@@ -19,17 +18,17 @@
1918
sock.connect((HOST, PORT))
2019

2120
# Send file
22-
with open('img.png', 'rb') as f:
21+
with open("img.png", "rb") as f:
2322
data = f.read()
2423

25-
print('Sending ({}): {}'.format(len(data), data))
24+
print("Sending ({}): {}".format(len(data), data))
2625
print()
2726

2827
send_msg__with_crc32(sock, data)
2928

30-
print('Receiving')
29+
print("Receiving")
3130

3231
response_data = recv_msg__with_crc32(sock)
33-
print('Response ({}): {}'.format(len(response_data), response_data))
32+
print("Response ({}): {}".format(len(response_data), response_data))
3433

35-
print('Close\n')
34+
print("Close\n")
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

77
import socket
88

99
import sys
10-
sys.path.append('..')
11-
10+
sys.path.append("..")
1211
from common import send_msg__with_crc32, recv_msg__with_crc32
1312

1413

1514
PORT = 9090
1615

1716

1817
with socket.socket() as sock:
19-
sock.bind(('', PORT))
18+
sock.bind(("", PORT))
2019
sock.listen()
2120

22-
print('Server: {}'.format(sock.getsockname()))
21+
print("Server: {}".format(sock.getsockname()))
2322

2423
while True:
2524
conn, addr = sock.accept()
26-
print('Connected:', addr)
25+
print("Connected:", addr)
2726

2827
data = recv_msg__with_crc32(conn)
29-
print('Receiving ({}): {}'.format(len(data), data))
28+
print("Receiving ({}): {}".format(len(data), data))
3029

31-
text = 'Ok! Message size: {}'.format(len(data))
32-
print('Sending: {}'.format(text))
30+
text = "Ok! Message size: {}".format(len(data))
31+
print("Sending: {}".format(text))
3332

34-
rs = bytes(text, 'utf-8')
33+
rs = bytes(text, "utf-8")
3534
send_msg__with_crc32(conn, rs)
3635

37-
print('Close\n')
36+
print("Close\n")
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

7-
import socket
87
import json
8+
import socket
99

1010
import sys
11-
sys.path.append('..')
12-
11+
sys.path.append("..")
1312
from common import send_msg, recv_msg
1413

1514

@@ -20,19 +19,19 @@
2019
sock.connect((HOST, PORT))
2120

2221
data = {
23-
'title': 'test',
24-
'counter': 1,
22+
"title": "test",
23+
"counter": 1,
2524
}
2625
data = json.dumps(data)
27-
data = bytes(data, 'utf-8')
28-
print('Sending ({}): {}'.format(len(data), data))
26+
data = bytes(data, "utf-8")
27+
print("Sending ({}): {}".format(len(data), data))
2928
print()
3029

3130
send_msg(sock, data)
3231

33-
print('Receiving')
32+
print("Receiving")
3433

3534
response_data = recv_msg(sock)
36-
print('Response ({}): {}'.format(len(response_data), response_data))
35+
print("Response ({}): {}".format(len(response_data), response_data))
3736

38-
print('Close\n')
37+
print("Close\n")
Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
__author__ = 'ipetrash'
4+
__author__ = "ipetrash"
55

66

7-
import socket
87
import json
8+
import socket
99

1010
import sys
11-
sys.path.append('..')
12-
11+
sys.path.append("..")
1312
from common import send_msg, recv_msg
1413

1514

1615
PORT = 9090
1716

1817

1918
with socket.socket() as sock:
20-
sock.bind(('', PORT))
19+
sock.bind(("", PORT))
2120
sock.listen()
2221

23-
print('Server: {}'.format(sock.getsockname()))
22+
print("Server: {}".format(sock.getsockname()))
2423

2524
while True:
2625
conn, addr = sock.accept()
27-
print('Connected:', addr)
26+
print("Connected:", addr)
2827

2928
data = recv_msg(conn)
30-
print('Receiving ({}): {}'.format(len(data), data))
29+
print("Receiving ({}): {}".format(len(data), data))
3130

32-
json_data = json.loads(data, encoding='utf-8')
33-
print('json_data:', json_data)
31+
json_data = json.loads(data, encoding="utf-8")
32+
print("json_data:", json_data)
3433

35-
json_data['title'] = 'updates'
36-
json_data['counter'] += 1
34+
json_data["title"] = "updates"
35+
json_data["counter"] += 1
3736

3837
data = json.dumps(json_data)
39-
print('Sending: {}'.format(data))
38+
print("Sending: {}".format(data))
4039

41-
rs = bytes(data, 'utf-8')
40+
rs = bytes(data, "utf-8")
4241
send_msg(conn, rs)
4342

44-
print('Close\n')
43+
print("Close\n")

0 commit comments

Comments
 (0)