remove py27-isms

Author: Kriechi

hyperframe/flags.py

@@ -6,12 +6,7 @@
 Defines basic Flag and Flags data structures.
 """
 import collections
-
-try:
-    from collections.abc import MutableSet
-except ImportError:  # pragma: no cover
-    # Python 2.7 compatibility
-    from collections import MutableSet
+from collections.abc import MutableSet
 
 Flag = collections.namedtuple("Flag", ["name", "bit"])
 

hyperframe/frame.py

@@ -38,7 +38,7 @@
 _STRUCT_B = struct.Struct(">B")
 
 
-class Frame(object):
+class Frame:
     """
     The base class for all HTTP/2 frames.
     """
@@ -175,13 +175,13 @@ def parse_body(self, data):
         raise NotImplementedError()
 
 
-class Padding(object):
+class Padding:
     """
     Mixin for frames that contain padding. Defines extra fields that can be
     used and set by frames that can be padded.
     """
     def __init__(self, stream_id, pad_length=0, **kwargs):
-        super(Padding, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The length of the padding to use.
         self.pad_length = pad_length
@@ -212,7 +212,7 @@ def total_padding(self):  # pragma: no cover
         return self.pad_length
 
 
-class Priority(object):
+class Priority:
     """
     Mixin for frames that contain priority data. Defines extra fields that can
     be used and set by frames that contain priority data.
@@ -223,7 +223,7 @@ def __init__(self,
                  stream_weight=0x0,
                  exclusive=False,
                  **kwargs):
-        super(Priority, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The stream ID of the stream on which this stream depends.
         self.depends_on = depends_on
@@ -269,7 +269,7 @@ class DataFrame(Padding, Frame):
     stream_association = _STREAM_ASSOC_HAS_STREAM
 
     def __init__(self, stream_id, data=b'', **kwargs):
-        super(DataFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The data contained on this frame.
         self.data = data
@@ -351,7 +351,7 @@ class RstStreamFrame(Frame):
     stream_association = _STREAM_ASSOC_HAS_STREAM
 
     def __init__(self, stream_id, error_code=0, **kwargs):
-        super(RstStreamFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The error code used when resetting the stream.
         self.error_code = error_code
@@ -412,7 +412,7 @@ class SettingsFrame(Frame):
     ENABLE_CONNECT_PROTOCOL = 0x08
 
     def __init__(self, stream_id=0, settings=None, **kwargs):
-        super(SettingsFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         if settings and "ACK" in kwargs.get("flags", ()):
             raise InvalidFrameError(
@@ -463,7 +463,7 @@ class PushPromiseFrame(Padding, Frame):
     stream_association = _STREAM_ASSOC_HAS_STREAM
 
     def __init__(self, stream_id, promised_stream_id=0, data=b'', **kwargs):
-        super(PushPromiseFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The stream ID that is promised by this frame.
         self.promised_stream_id = promised_stream_id
@@ -518,7 +518,7 @@ class PingFrame(Frame):
     stream_association = _STREAM_ASSOC_NO_STREAM
 
     def __init__(self, stream_id=0, opaque_data=b'', **kwargs):
-        super(PingFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The opaque data sent in this PING frame, as a bytestring.
         self.opaque_data = opaque_data
@@ -565,7 +565,7 @@ def __init__(self,
                  error_code=0,
                  additional_data=b'',
                  **kwargs):
-        super(GoAwayFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The last stream ID definitely seen by the remote peer.
         self.last_stream_id = last_stream_id
@@ -621,7 +621,7 @@ class WindowUpdateFrame(Frame):
     stream_association = _STREAM_ASSOC_EITHER
 
     def __init__(self, stream_id, window_increment=0, **kwargs):
-        super(WindowUpdateFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The amount the flow control window is to be incremented.
         self.window_increment = window_increment
@@ -675,7 +675,7 @@ class HeadersFrame(Padding, Priority, Frame):
     stream_association = _STREAM_ASSOC_HAS_STREAM
 
     def __init__(self, stream_id, data=b'', **kwargs):
-        super(HeadersFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The HPACK-encoded header block.
         self.data = data
@@ -728,7 +728,7 @@ class ContinuationFrame(Frame):
     stream_association = _STREAM_ASSOC_HAS_STREAM
 
     def __init__(self, stream_id, data=b'', **kwargs):
-        super(ContinuationFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         #: The HPACK-encoded header block.
         self.data = data
@@ -761,7 +761,7 @@ class AltSvcFrame(Frame):
     stream_association = _STREAM_ASSOC_EITHER
 
     def __init__(self, stream_id, origin=b'', field=b'', **kwargs):
-        super(AltSvcFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
 
         if not isinstance(origin, bytes):
             raise InvalidFrameError("AltSvc origin must be bytestring.")
@@ -808,7 +808,7 @@ class ExtensionFrame(Frame):
     stream_association = _STREAM_ASSOC_EITHER
 
     def __init__(self, type, stream_id, **kwargs):
-        super(ExtensionFrame, self).__init__(stream_id, **kwargs)
+        super().__init__(stream_id, **kwargs)
         self.type = type
         self.flag_byte = None
 

test/test_flags.py

@@ -5,7 +5,7 @@
 import pytest
 
 
-class TestFlags(object):
+class TestFlags:
     def test_add(self):
         flags = Flags([Flag("VALID_FLAG", 0x00)])
         assert not flags

test/test_frames.py

@@ -17,7 +17,7 @@ def decode_frame(frame_data):
     return f
 
 
-class TestGeneralFrameBehaviour(object):
+class TestGeneralFrameBehaviour:
     def test_base_frame_ignores_flags(self):
         f = Frame(stream_id=0)
         flags = f.parse_flags(0xFF)
@@ -100,7 +100,7 @@ def test_cannot_parse_invalid_frame_header(self):
             Frame.parse_frame_header(b'\x00\x00\x08\x00\x01\x00\x00\x00')
 
 
-class TestDataFrame(object):
+class TestDataFrame:
     payload = b'\x00\x00\x08\x00\x01\x00\x00\x00\x01testdata'
     payload_with_padding = (
         b'\x00\x00\x13\x00\x09\x00\x00\x00\x01\x0Atestdata' + b'\0' * 10
@@ -228,7 +228,7 @@ def test_data_frame_with_no_length_parses(self):
         assert new_frame.data == b''
 
 
-class TestPriorityFrame(object):
+class TestPriorityFrame:
     payload = b'\x00\x00\x05\x02\x00\x00\x00\x00\x01\x80\x00\x00\x04\x40'
 
     def test_priority_frame_has_no_flags(self):
@@ -277,7 +277,7 @@ def test_short_priority_frame_errors(self):
             decode_frame(self.payload[:-2])
 
 
-class TestRstStreamFrame(object):
+class TestRstStreamFrame:
     def test_rst_stream_frame_has_no_flags(self):
         f = RstStreamFrame(1)
         flags = f.parse_flags(0xFF)
@@ -310,7 +310,7 @@ def test_rst_stream_frame_must_have_body_length_four(self):
             f.parse_body(b'\x01')
 
 
-class TestSettingsFrame(object):
+class TestSettingsFrame:
     serialized = (
         b'\x00\x00\x2A\x04\x01\x00\x00\x00\x00' +  # Frame header
         b'\x00\x01\x00\x00\x10\x00' +              # HEADER_TABLE_SIZE
@@ -390,7 +390,7 @@ def test_short_settings_frame_errors(self):
             decode_frame(self.serialized[:-2])
 
 
-class TestPushPromiseFrame(object):
+class TestPushPromiseFrame:
     def test_push_promise_frame_flags(self):
         f = PushPromiseFrame(1)
         flags = f.parse_flags(0xFF)
@@ -475,7 +475,7 @@ def test_short_push_promise_errors(self):
             decode_frame(s)
 
 
-class TestPingFrame(object):
+class TestPingFrame:
     def test_ping_frame_has_only_one_flag(self):
         f = PingFrame()
         flags = f.parse_flags(0xFF)
@@ -527,7 +527,7 @@ def test_ping_frame_has_no_less_than_body_length_8(self):
             f.parse_body(b'\x01\x02\x03\x04\x05\x06\x07')
 
 
-class TestGoAwayFrame(object):
+class TestGoAwayFrame:
     def test_go_away_has_no_flags(self):
         f = GoAwayFrame()
         flags = f.parse_flags(0xFF)
@@ -590,7 +590,7 @@ def test_short_goaway_frame_errors(self):
             decode_frame(s)
 
 
-class TestWindowUpdateFrame(object):
+class TestWindowUpdateFrame:
     def test_window_update_has_no_flags(self):
         f = WindowUpdateFrame(0)
         flags = f.parse_flags(0xFF)
@@ -630,7 +630,7 @@ def test_short_windowupdate_frame_errors(self):
             decode_frame(WindowUpdateFrame(2**31).serialize())
 
 
-class TestHeadersFrame(object):
+class TestHeadersFrame:
     def test_headers_frame_flags(self):
         f = HeadersFrame(1)
         flags = f.parse_flags(0xFF)
@@ -712,7 +712,7 @@ def test_headers_frame_with_no_length_parses(self):
         assert new_frame.data == b''
 
 
-class TestContinuationFrame(object):
+class TestContinuationFrame:
     def test_continuation_frame_flags(self):
         f = ContinuationFrame(1)
         flags = f.parse_flags(0xFF)
@@ -740,7 +740,7 @@ def test_continuation_frame_parses_properly(self):
         assert f.body_len == 11
 
 
-class TestAltSvcFrame(object):
+class TestAltSvcFrame:
     payload_with_origin = (
         b'\x00\x00\x31'  # Length
         b'\x0A'  # Type