@@ -200,8 +200,15 @@ def parse_padding_data(self, data):
200200 return 1
201201 return 0
202202
203+ #: .. deprecated:: 5.2.1
204+ #: Use self.pad_length instead.
203205 @property
204- def total_padding (self ):
206+ def total_padding (self ): # pragma: no cover
207+ import warnings
208+ warnings .warn (
209+ "total_padding contains the same information as pad_length." ,
210+ DeprecationWarning
211+ )
205212 return self .pad_length
206213
207214
@@ -269,19 +276,19 @@ def __init__(self, stream_id, data=b'', **kwargs):
269276
270277 def serialize_body (self ):
271278 padding_data = self .serialize_padding_data ()
272- padding = b'\0 ' * self .total_padding
279+ padding = b'\0 ' * self .pad_length
273280 if isinstance (self .data , memoryview ):
274281 self .data = self .data .tobytes ()
275282 return b'' .join ([padding_data , self .data , padding ])
276283
277284 def parse_body (self , data ):
278285 padding_data_length = self .parse_padding_data (data )
279286 self .data = (
280- data [padding_data_length :len (data )- self .total_padding ].tobytes ()
287+ data [padding_data_length :len (data )- self .pad_length ].tobytes ()
281288 )
282289 self .body_len = len (data )
283290
284- if self .total_padding and self .total_padding >= self .body_len :
291+ if self .pad_length and self .pad_length >= self .body_len :
285292 raise InvalidPaddingError ("Padding is too long." )
286293
287294 @property
@@ -294,7 +301,7 @@ def flow_controlled_length(self):
294301 if 'PADDED' in self .flags :
295302 # Account for extra 1-byte padding length field, which is still
296303 # present if possibly zero-valued.
297- padding_len = self .total_padding + 1
304+ padding_len = self .pad_length + 1
298305 return len (self .data ) + padding_len
299306
300307
@@ -453,7 +460,7 @@ def __init__(self, stream_id, promised_stream_id=0, data=b'', **kwargs):
453460
454461 def serialize_body (self ):
455462 padding_data = self .serialize_padding_data ()
456- padding = b'\0 ' * self .total_padding
463+ padding = b'\0 ' * self .pad_length
457464 data = _STRUCT_L .pack (self .promised_stream_id )
458465 return b'' .join ([padding_data , data , self .data , padding ])
459466
@@ -470,7 +477,7 @@ def parse_body(self, data):
470477 self .data = data [padding_data_length + 4 :].tobytes ()
471478 self .body_len = len (data )
472479
473- if self .total_padding and self .total_padding >= self .body_len :
480+ if self .pad_length and self .pad_length >= self .body_len :
474481 raise InvalidPaddingError ("Padding is too long." )
475482
476483
@@ -642,7 +649,7 @@ def __init__(self, stream_id, data=b'', **kwargs):
642649
643650 def serialize_body (self ):
644651 padding_data = self .serialize_padding_data ()
645- padding = b'\0 ' * self .total_padding
652+ padding = b'\0 ' * self .pad_length
646653
647654 if 'PRIORITY' in self .flags :
648655 priority_data = self .serialize_priority_data ()
@@ -662,10 +669,10 @@ def parse_body(self, data):
662669
663670 self .body_len = len (data )
664671 self .data = (
665- data [priority_data_length :len (data )- self .total_padding ].tobytes ()
672+ data [priority_data_length :len (data )- self .pad_length ].tobytes ()
666673 )
667674
668- if self .total_padding and self .total_padding >= self .body_len :
675+ if self .pad_length and self .pad_length >= self .body_len :
669676 raise InvalidPaddingError ("Padding is too long." )
670677
671678
0 commit comments