rename and unify setting variable names

Author: Kriechi

hyperframe/frame.py

@@ -343,17 +343,28 @@ class SettingsFrame(Frame):
     # We need to define the known settings, they may as well be class
     # attributes.
     #: The byte that signals the SETTINGS_HEADER_TABLE_SIZE setting.
-    HEADER_TABLE_SIZE             = 0x01
+    HEADER_TABLE_SIZE      = 0x01
     #: The byte that signals the SETTINGS_ENABLE_PUSH setting.
-    ENABLE_PUSH                   = 0x02
+    ENABLE_PUSH            = 0x02
     #: The byte that signals the SETTINGS_MAX_CONCURRENT_STREAMS setting.
-    MAX_CONCURRENT_STREAMS        = 0x03
+    MAX_CONCURRENT_STREAMS = 0x03
     #: The byte that signals the SETTINGS_INITIAL_WINDOW_SIZE setting.
-    INITIAL_WINDOW_SIZE           = 0x04
+    INITIAL_WINDOW_SIZE    = 0x04
     #: The byte that signals the SETTINGS_MAX_FRAME_SIZE setting.
-    SETTINGS_MAX_FRAME_SIZE       = 0x05
+    MAX_FRAME_SIZE         = 0x05
     #: The byte that signals the SETTINGS_MAX_HEADER_LIST_SIZE setting.
-    SETTINGS_MAX_HEADER_LIST_SIZE = 0x06
+    MAX_HEADER_LIST_SIZE   = 0x06
+
+    """
+        .. deprecated:: 3.1.2
+        Use :SettingsFrame:`MAX_FRAME_SIZE` instead.
+    """
+    SETTINGS_MAX_FRAME_SIZE = MAX_FRAME_SIZE
+    """
+        .. deprecated:: 3.1.2
+        Use :SettingsFrame:`MAX_HEADER_LIST_SIZE` instead.
+    """
+    SETTINGS_MAX_HEADER_LIST_SIZE = MAX_HEADER_LIST_SIZE
 
     def __init__(self, stream_id=0, settings=None, **kwargs):
         super(SettingsFrame, self).__init__(stream_id, **kwargs)

test/test_frames.py

@@ -255,17 +255,17 @@ class TestSettingsFrame(object):
         b'\x00\x02\x00\x00\x00\x00'             +  # ENABLE_PUSH
         b'\x00\x03\x00\x00\x00\x64'             +  # MAX_CONCURRENT_STREAMS
         b'\x00\x04\x00\x00\xFF\xFF'             +  # INITIAL_WINDOW_SIZE
-        b'\x00\x05\x00\x00\x40\x00'             +  # SETTINGS_MAX_FRAME_SIZE
-        b'\x00\x06\x00\x00\xFF\xFF'                # SETTINGS_MAX_HEADER_LIST_SIZE
+        b'\x00\x05\x00\x00\x40\x00'             +  # MAX_FRAME_SIZE
+        b'\x00\x06\x00\x00\xFF\xFF'                # MAX_HEADER_LIST_SIZE
     )
 
     settings = {
         SettingsFrame.HEADER_TABLE_SIZE: 4096,
         SettingsFrame.ENABLE_PUSH: 0,
         SettingsFrame.MAX_CONCURRENT_STREAMS: 100,
         SettingsFrame.INITIAL_WINDOW_SIZE: 65535,
-        SettingsFrame.SETTINGS_MAX_FRAME_SIZE: 16384,
-        SettingsFrame.SETTINGS_MAX_HEADER_LIST_SIZE: 65535,
+        SettingsFrame.MAX_FRAME_SIZE: 16384,
+        SettingsFrame.MAX_HEADER_LIST_SIZE: 65535,
     }
 
     def test_settings_frame_has_only_one_flag(self):