X Tutup
Skip to content

Commit cfed7c5

Browse files
methanemethane
authored
hatch fmt (fluent#204)
Signed-off-by: Inada Naoki <songofacandy@gmail.com>
1 parent c8d7dde commit cfed7c5

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

‎fluent/asynchandler.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from fluent import asyncsender
2-
from fluent import handler
1+
from fluent import asyncsender, handler
32

43

54
class FluentHandler(handler.FluentHandler):

‎fluent/asyncsender.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import threading
2-
from queue import Queue, Full, Empty
2+
from queue import Empty, Full, Queue
33

44
from fluent import sender
55
from fluent.sender import EventTime

‎fluent/handler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(
7676
self._formatter = self._format_by_dict
7777
self.usesTime = self._format_by_dict_uses_time
7878
else:
79-
if hasattr(fmt, "__call__"):
79+
if callable(fmt):
8080
self._formatter = fmt
8181
self.usesTime = fmt.usesTime
8282
else:

‎tests/test_asyncsender.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import socket
21
import unittest
32

43
import msgpack
@@ -122,13 +121,13 @@ def test_no_last_error_on_successful_emit(self):
122121

123122
def test_last_error_property(self):
124123
EXCEPTION_MSG = "custom exception for testing last_error property"
125-
self._sender.last_error = socket.error(EXCEPTION_MSG)
124+
self._sender.last_error = OSError(EXCEPTION_MSG)
126125

127126
self.assertEqual(self._sender.last_error.args[0], EXCEPTION_MSG)
128127

129128
def test_clear_last_error(self):
130129
EXCEPTION_MSG = "custom exception for testing clear_last_error"
131-
self._sender.last_error = socket.error(EXCEPTION_MSG)
130+
self._sender.last_error = OSError(EXCEPTION_MSG)
132131
self._sender.clear_last_error()
133132

134133
self.assertEqual(self._sender.last_error, None)
@@ -141,7 +140,7 @@ def test_connect_exception_during_sender_init(self, mock_socket):
141140
# Make the socket.socket().connect() call raise a custom exception
142141
mock_connect = mock_socket.socket.return_value.connect
143142
EXCEPTION_MSG = "a sender init socket connect() exception"
144-
mock_connect.side_effect = socket.error(EXCEPTION_MSG)
143+
mock_connect.side_effect = OSError(EXCEPTION_MSG)
145144

146145
self.assertEqual(self._sender.last_error.args[0], EXCEPTION_MSG)
147146

‎tests/test_event.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_logging_with_timestamp(self):
2828
# XXX: This tests succeeds even if the fluentd connection failed
2929

3030
# send event with tag app.follow, with timestamp
31-
event.Event("follow", {"from": "userA", "to": "userB"}, time=int(0))
31+
event.Event("follow", {"from": "userA", "to": "userB"}, time=0)
3232

3333
def test_no_last_error_on_successful_event(self):
3434
global_sender = sender.get_global_sender()

‎tests/test_sender.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import errno
2-
import socket
32
import sys
43
import unittest
54
from shutil import rmtree
@@ -121,13 +120,13 @@ def test_no_last_error_on_successful_emit(self):
121120

122121
def test_last_error_property(self):
123122
EXCEPTION_MSG = "custom exception for testing last_error property"
124-
self._sender.last_error = socket.error(EXCEPTION_MSG)
123+
self._sender.last_error = OSError(EXCEPTION_MSG)
125124

126125
self.assertEqual(self._sender.last_error.args[0], EXCEPTION_MSG)
127126

128127
def test_clear_last_error(self):
129128
EXCEPTION_MSG = "custom exception for testing clear_last_error"
130-
self._sender.last_error = socket.error(EXCEPTION_MSG)
129+
self._sender.last_error = OSError(EXCEPTION_MSG)
131130
self._sender.clear_last_error()
132131

133132
self.assertEqual(self._sender.last_error, None)
@@ -225,12 +224,12 @@ def __init__(self):
225224
self.send_side_effects = [3, 0, 9]
226225
self.send_idx = 0
227226
self.recv_side_effects = [
228-
socket.error(errno.EWOULDBLOCK, "Blah"),
227+
OSError(errno.EWOULDBLOCK, "Blah"),
229228
b"this data is going to be ignored",
230229
b"",
231-
socket.error(errno.EWOULDBLOCK, "Blah"),
232-
socket.error(errno.EWOULDBLOCK, "Blah"),
233-
socket.error(errno.EACCES, "This error will never happen"),
230+
OSError(errno.EWOULDBLOCK, "Blah"),
231+
OSError(errno.EWOULDBLOCK, "Blah"),
232+
OSError(errno.EACCES, "This error will never happen"),
234233
]
235234
self.recv_idx = 0
236235

0 commit comments

Comments
 (0)
X Tutup