Skip to content

Commit e2fc942

Browse files
committed
Refactoring. Using black code style
1 parent 141830c commit e2fc942

File tree

8 files changed

+95
-102
lines changed

8 files changed

+95
-102
lines changed
Lines changed: 12 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

77
import contextlib
8-
import sys
98
import socket
9+
import sys
1010

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

1514

@@ -21,24 +20,26 @@ def __init__(self, socket: socket.socket):
2120
self.socket = socket
2221

2322
def write(self, text: str):
24-
data = text.encode('utf-8')
25-
print(f'Sending ({len(data)}): {data!r}', file=sys.stderr)
23+
data = text.encode("utf-8")
24+
print(f"Sending ({len(data)}): {data!r}", file=sys.stderr)
2625

2726
send_msg(self.socket, data)
2827

2928
response_data = recv_msg(self.socket)
3029
if response_data:
31-
print(f'Response ({len(response_data)}): {response_data!r}', file=sys.stderr)
30+
print(
31+
f"Response ({len(response_data)}): {response_data!r}", file=sys.stderr
32+
)
3233

3334

3435
sock = socket.socket()
3536
sock.connect((HOST, PORT))
3637

3738
f = SocketIO(sock)
3839
with contextlib.redirect_stdout(f):
39-
print('123')
40-
print('Hello World!')
41-
print('Привет мир!')
40+
print("123")
41+
print("Hello World!")
42+
print("Привет мир!")
4243

4344
for i in range(1, 5 + 1):
44-
print(f'{i} * {i} = {i * i}')
45+
print(f"{i} * {i} = {i * i}")
Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
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(f'Server: {sock.getsockname()}')
21+
print(f"Server: {sock.getsockname()}")
2322

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

2827
while True:
2928
data = recv_msg(conn)
3029
if not data:
3130
break
3231

33-
print(f'Receiving ({len(data)}): {data}')
32+
print(f"Receiving ({len(data)}): {data}")
3433

35-
print('Sending')
36-
data = data.decode('utf-8').upper().encode('utf-8')
34+
print("Sending")
35+
data = data.decode("utf-8").upper().encode("utf-8")
3736
send_msg(conn, data)
3837

39-
print('Close\n')
38+
print("Close\n")
Lines changed: 10 additions & 11 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,23 +18,23 @@
1918
sock.connect((HOST, PORT))
2019

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

25-
print('Sending {} bytes'.format(len(data)))
24+
print("Sending {} bytes".format(len(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 {} bytes'.format(len(response_data)))
32+
print("Response {} bytes".format(len(response_data)))
3433

35-
file_name = 'img_thumbnail.jpg'
36-
print('Save in ' + file_name)
34+
file_name = "img_thumbnail.jpg"
35+
print("Save in " + file_name)
3736

38-
with open(file_name, 'wb') as f:
37+
with open(file_name, "wb") as f:
3938
f.write(response_data)
4039

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

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

66

7-
from PIL import Image
87
import io
9-
108
import socket
119

12-
import sys
13-
sys.path.append('..')
10+
from PIL import Image
1411

12+
import sys
13+
sys.path.append("..")
1514
from common import send_msg, recv_msg
1615

1716

1817
PORT = 9090
1918

2019

2120
with socket.socket() as sock:
22-
sock.bind(('', PORT))
21+
sock.bind(("", PORT))
2322
sock.listen()
2423

25-
print('Server: {}'.format(sock.getsockname()))
24+
print("Server: {}".format(sock.getsockname()))
2625

2726
while True:
2827
conn, addr = sock.accept()
29-
print('Connected:', addr)
28+
print("Connected:", addr)
3029

3130
data = recv_msg(conn)
32-
print('Receiving {} bytes'.format(len(data)))
31+
print("Receiving {} bytes".format(len(data)))
3332

3433
img = Image.open(io.BytesIO(data))
35-
print('Receiving image:', img)
34+
print("Receiving image:", img)
3635

37-
print('Transform image in thumbnail')
36+
print("Transform image in thumbnail")
3837

3938
# Transform in thumbnail
4039
img.thumbnail((75, 75))
4140

42-
print('Img:', img)
41+
print("Img:", img)
4342

4443
# Write thumbnail in buffer
4544
data_io = io.BytesIO()
46-
img.save(data_io, 'jpeg')
45+
img.save(data_io, "jpeg")
4746

4847
response_data = data_io.getvalue()
4948

50-
print('Sending {} bytes'.format(len(response_data)))
49+
print("Sending {} bytes".format(len(response_data)))
5150

5251
send_msg(conn, response_data)
5352

54-
print('Close\n')
53+
print("Close\n")
Lines changed: 10 additions & 11 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,23 +18,23 @@
1918
sock.connect((HOST, PORT))
2019

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

25-
print('Sending {} bytes'.format(len(data)))
24+
print("Sending {} bytes".format(len(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 {} bytes'.format(len(response_data)))
32+
print("Response {} bytes".format(len(response_data)))
3433

35-
file_name = 'img_thumbnail.jpg'
36-
print('Save in ' + file_name)
34+
file_name = "img_thumbnail.jpg"
35+
print("Save in " + file_name)
3736

38-
with open(file_name, 'wb') as f:
37+
with open(file_name, "wb") as f:
3938
f.write(response_data)
4039

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

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

66

7-
from PIL import Image
87
import io
9-
108
import socket
119

12-
import sys
13-
sys.path.append('..')
10+
from PIL import Image
1411

12+
import sys
13+
sys.path.append("..")
1514
from common import send_msg__with_crc32, recv_msg__with_crc32
1615

1716

1817
PORT = 9090
1918

2019

2120
with socket.socket() as sock:
22-
sock.bind(('', PORT))
21+
sock.bind(("", PORT))
2322
sock.listen()
2423

25-
print('Server: {}'.format(sock.getsockname()))
24+
print("Server: {}".format(sock.getsockname()))
2625

2726
while True:
2827
conn, addr = sock.accept()
29-
print('Connected:', addr)
28+
print("Connected:", addr)
3029

3130
data = recv_msg__with_crc32(conn)
32-
print('Receiving {} bytes'.format(len(data)))
31+
print("Receiving {} bytes".format(len(data)))
3332

3433
img = Image.open(io.BytesIO(data))
35-
print('Receiving image:', img)
34+
print("Receiving image:", img)
3635

37-
print('Transform image in thumbnail')
36+
print("Transform image in thumbnail")
3837

3938
# Transform in thumbnail
4039
img.thumbnail((75, 75))
4140

42-
print('Img:', img)
41+
print("Img:", img)
4342

4443
# Write thumbnail in buffer
4544
data_io = io.BytesIO()
46-
img.save(data_io, 'jpeg')
45+
img.save(data_io, "jpeg")
4746

4847
response_data = data_io.getvalue()
4948

50-
print('Sending {} bytes'.format(len(response_data)))
49+
print("Sending {} bytes".format(len(response_data)))
5150

5251
send_msg__with_crc32(conn, response_data)
5352

54-
print('Close\n')
53+
print("Close\n")
Lines changed: 10 additions & 11 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,25 +18,25 @@ def send_command(command: str) -> str:
1918
with socket.socket() as sock:
2019
sock.connect((HOST, PORT))
2120

22-
data = bytes(command, 'utf-8')
21+
data = bytes(command, "utf-8")
2322
send_msg(sock, data)
2423

2524
response_data = recv_msg(sock)
26-
return str(response_data, 'utf-8')
25+
return str(response_data, "utf-8")
2726

2827

29-
if __name__ == '__main__':
30-
rs = send_command('CURRENT_DATETIME')
28+
if __name__ == "__main__":
29+
rs = send_command("CURRENT_DATETIME")
3130
print(rs)
3231

33-
rs = send_command('CURRENT_TIMESTAMP')
32+
rs = send_command("CURRENT_TIMESTAMP")
3433
print(rs)
3534

36-
rs = send_command('RANDOM')
35+
rs = send_command("RANDOM")
3736
print(rs)
3837

39-
rs = send_command('FOO_BAR')
38+
rs = send_command("FOO_BAR")
4039
print(rs)
4140

42-
rs = send_command('EXIT')
41+
rs = send_command("EXIT")
4342
print(rs)

0 commit comments

Comments
 (0)