pyupgrade --py36-plus fluent/*.py tests/*.py

Signed-off-by: Inada Naoki <songofacandy@gmail.com>

fluent/asynchandler.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from fluent import asyncsender
 from fluent import handler
 
@@ -18,7 +16,7 @@ def close(self):
             try:
                 self.sender.close()
             finally:
-                super(FluentHandler, self).close()
+                super().close()
         finally:
             self.release()
 

fluent/asyncsender.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import threading
 from queue import Queue, Full, Empty
 
@@ -55,7 +53,7 @@ def __init__(
         """
         :param kwargs: This kwargs argument is not used in __init__. This will be removed in the next major version.
         """
-        super(FluentSender, self).__init__(
+        super().__init__(
             tag=tag,
             host=host,
             port=port,
@@ -132,7 +130,7 @@ def _send(self, bytes_):
             return True
 
     def _send_loop(self):
-        send_internal = super(FluentSender, self)._send_internal
+        send_internal = super()._send_internal
 
         try:
             while True:

fluent/event.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
-
 import time
 
 from fluent import sender
 
 
-class Event(object):
+class Event:
     def __init__(self, label, data, **kwargs):
         assert isinstance(data, dict), "data must be a dict"
         sender_ = kwargs.get("sender", sender.get_global_sender())

fluent/handler.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 import socket
 import sys
@@ -12,7 +10,7 @@
 from fluent import sender
 
 
-class FluentRecordFormatter(logging.Formatter, object):
+class FluentRecordFormatter(logging.Formatter):
     """A structured formatter for Fluent.
 
     Best used with server storing data in an ElasticSearch cluster for example.
@@ -42,7 +40,7 @@ def __init__(
         format_json=True,
         exclude_attrs=None,
     ):
-        super(FluentRecordFormatter, self).__init__(None, datefmt)
+        super().__init__(None, datefmt)
 
         if sys.version_info[0:2] >= (3, 2) and style != "%":
             self.__style, basic_fmt_dict = {
@@ -75,7 +73,7 @@ def __init__(
             self._exc_attrs = set(exclude_attrs)
             self._fmt_dict = None
             self._formatter = self._format_by_exclusion
-            self.usesTime = super(FluentRecordFormatter, self).usesTime
+            self.usesTime = super().usesTime
         else:
             self._exc_attrs = None
             if not fmt:
@@ -102,7 +100,7 @@ def __init__(
 
     def format(self, record):
         # Compute attributes handled by parent class.
-        super(FluentRecordFormatter, self).format(record)
+        super().format(record)
         # Add ours
         record.hostname = self.hostname
 
@@ -144,7 +142,7 @@ def _format_msg_json(self, record, msg):
             return self._format_msg_default(record, msg)
 
     def _format_msg_default(self, record, msg):
-        return {"message": super(FluentRecordFormatter, self).format(record)}
+        return {"message": super().format(record)}
 
     def _format_by_exclusion(self, record):
         data = {}
@@ -273,7 +271,7 @@ def close(self):
             try:
                 self.sender.close()
             finally:
-                super(FluentHandler, self).close()
+                super().close()
         finally:
             self.release()
 

fluent/sender.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import errno
 import socket
 import struct
@@ -35,14 +33,14 @@ class EventTime(msgpack.ExtType):
     def __new__(cls, timestamp):
         seconds = int(timestamp)
         nanoseconds = int(timestamp % 1 * 10**9)
-        return super(EventTime, cls).__new__(
+        return super().__new__(
             cls,
             code=0,
             data=struct.pack(">II", seconds, nanoseconds),
         )
 
 
-class FluentSender(object):
+class FluentSender:
     def __init__(
         self,
         tag,
@@ -155,7 +153,7 @@ def _send_internal(self, bytes_):
             self.pendings = None
 
             return True
-        except socket.error as e:
+        except OSError as e:
             self.last_error = e
 
             # close socket
@@ -175,13 +173,13 @@ def _check_recv_side(self):
             self.socket.settimeout(0.0)
             try:
                 recvd = self.socket.recv(4096)
-            except socket.error as recv_e:
+            except OSError as recv_e:
                 if recv_e.errno != errno.EWOULDBLOCK:
                     raise
                 return
 
             if recvd == b"":
-                raise socket.error(errno.EPIPE, "Broken pipe")
+                raise OSError(errno.EPIPE, "Broken pipe")
         finally:
             self.socket.settimeout(self.timeout)
 
@@ -195,7 +193,7 @@ def _send_data(self, bytes_):
         while bytes_sent < bytes_to_send:
             sent = self.socket.send(bytes_[bytes_sent:])
             if sent == 0:
-                raise socket.error(errno.EPIPE, "Broken pipe")
+                raise OSError(errno.EPIPE, "Broken pipe")
             bytes_sent += sent
         self._check_recv_side()
 
@@ -236,12 +234,12 @@ def _close(self):
                 try:
                     try:
                         sock.shutdown(socket.SHUT_RDWR)
-                    except socket.error:  # pragma: no cover
+                    except OSError:  # pragma: no cover
                         pass
                 finally:
                     try:
                         sock.close()
-                    except socket.error:  # pragma: no cover
+                    except OSError:  # pragma: no cover
                         pass
         finally:
             self.socket = None

tests/mockserver.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 try:
     from cStringIO import StringIO as BytesIO
 except ImportError:
@@ -17,7 +15,7 @@ class MockRecvServer(threading.Thread):
     """
 
     def __init__(self, host="localhost", port=0):
-        super(MockRecvServer, self).__init__()
+        super().__init__()
 
         if host.startswith("unix://"):
             self.socket_proto = socket.AF_UNIX
@@ -55,7 +53,7 @@ def run(self):
                         if not data:
                             break
                         self._buf.write(data)
-                    except socket.error as e:
+                    except OSError as e:
                         print("MockServer error: %s" % e)
                         break
             finally:

tests/test_asynchandler.py

@@ -1,17 +1,15 @@
-#  -*- coding: utf-8 -*-
-
 import logging
 import sys
 import unittest
 
 try:
     from unittest import mock
 except ImportError:
-    import mock
+    from unittest import mock
 try:
     from unittest.mock import patch
 except ImportError:
-    from mock import patch
+    from unittest.mock import patch
 
 
 import fluent.asynchandler
@@ -27,7 +25,7 @@ def get_logger(name, level=logging.INFO):
 
 class TestHandler(unittest.TestCase):
     def setUp(self):
-        super(TestHandler, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._port = self._server.port
 
@@ -273,7 +271,7 @@ class TestHandlerWithCircularQueue(unittest.TestCase):
     Q_SIZE = 3
 
     def setUp(self):
-        super(TestHandlerWithCircularQueue, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._port = self._server.port
 
@@ -334,7 +332,7 @@ class TestHandlerWithCircularQueueHandler(unittest.TestCase):
     Q_SIZE = 1
 
     def setUp(self):
-        super(TestHandlerWithCircularQueueHandler, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._port = self._server.port
 
@@ -390,5 +388,5 @@ def custom_full_queue():
 
                 # we can't be sure to have exception in every case due to multithreading,
                 # so we can test only for a cautelative condition here
-                print("Exception raised: {} (expected 3)".format(exc_counter))
+                print(f"Exception raised: {exc_counter} (expected 3)")
                 assert exc_counter >= 0

tests/test_asyncsender.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
 import socket
 import unittest
 
@@ -47,7 +43,7 @@ def test_tolerant(self):
 
 class TestSender(unittest.TestCase):
     def setUp(self):
-        super(TestSender, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test", port=self._server.port
@@ -163,7 +159,7 @@ def test_sender_without_flush(self):
 
 class TestSenderDefaultProperties(unittest.TestCase):
     def setUp(self):
-        super(TestSenderDefaultProperties, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test", port=self._server.port
@@ -185,7 +181,7 @@ def test_default_properties(self):
 
 class TestSenderWithTimeout(unittest.TestCase):
     def setUp(self):
-        super(TestSenderWithTimeout, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test", port=self._server.port, queue_timeout=0.04
@@ -238,7 +234,7 @@ class TestSenderWithTimeoutAndCircular(unittest.TestCase):
     Q_SIZE = 3
 
     def setUp(self):
-        super(TestSenderWithTimeoutAndCircular, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test",
@@ -291,7 +287,7 @@ class TestSenderWithTimeoutMaxSizeNonCircular(unittest.TestCase):
     Q_SIZE = 3
 
     def setUp(self):
-        super(TestSenderWithTimeoutMaxSizeNonCircular, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test", port=self._server.port, queue_maxsize=self.Q_SIZE
@@ -342,7 +338,7 @@ class TestSenderUnlimitedSize(unittest.TestCase):
     Q_SIZE = 3
 
     def setUp(self):
-        super(TestSenderUnlimitedSize, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.asyncsender.FluentSender(
             tag="test", port=self._server.port, queue_timeout=0.04, queue_maxsize=0
@@ -365,7 +361,7 @@ def test_simple(self):
 
             NUM = 1000
             for i in range(1, NUM + 1):
-                ok = sender.emit("foo{}".format(i), {"bar": "baz{}".format(i)})
+                ok = sender.emit(f"foo{i}", {"bar": f"baz{i}"})
                 self.assertTrue(ok)
 
         data = self.get_data()
@@ -380,5 +376,5 @@ def test_simple(self):
 
         el = data[NUM - 1]
         eq(3, len(el))
-        eq("test.foo{}".format(NUM), el[0])
-        eq({"bar": "baz{}".format(NUM)}, el[2])
+        eq(f"test.foo{NUM}", el[0])
+        eq({"bar": f"baz{NUM}"}, el[2])

tests/test_event.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import unittest
 
 from fluent import event, sender

tests/test_handler.py

@@ -1,5 +1,3 @@
-#  -*- coding: utf-8 -*-
-
 import logging
 import sys
 import unittest
@@ -16,7 +14,7 @@ def get_logger(name, level=logging.INFO):
 
 class TestHandler(unittest.TestCase):
     def setUp(self):
-        super(TestHandler, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._port = self._server.port
 

tests/test_sender.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
 import errno
 import socket
 import sys
@@ -48,7 +44,7 @@ def test_tolerant(self):
 
 class TestSender(unittest.TestCase):
     def setUp(self):
-        super(TestSender, self).setUp()
+        super().setUp()
         self._server = mockserver.MockRecvServer("localhost")
         self._sender = fluent.sender.FluentSender(tag="test", port=self._server.port)