Skip to content

Commit

Permalink
decodeStreamData -> decode_stream_data
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinThoma committed Jun 11, 2022
1 parent 1584094 commit e983e22
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
21 changes: 6 additions & 15 deletions PyPDF2/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
str_data = decompress(data)
predictor = 1

Expand Down Expand Up @@ -190,8 +188,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
retval = ""
hex_pair = ""
index = 0
Expand Down Expand Up @@ -312,8 +308,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
return LZWDecode.Decoder(data).decode()


Expand All @@ -329,8 +323,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
if isinstance(data, str):
data = data.encode("ascii")
group_index = b = 0
Expand Down Expand Up @@ -364,8 +356,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
return data


Expand All @@ -379,8 +369,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
return data


Expand Down Expand Up @@ -446,8 +434,6 @@ def decode(
if "decodeParms" in kwargs:
deprecate_with_replacement("decodeParms", "parameters", "4.0.0")
parameters = kwargs["decodeParms"]
if parameters is None:
raise ValueError("Missing decode parameters")
parms = CCITTFaxDecode._get_parameters(parameters, height)

img_size = len(data)
Expand Down Expand Up @@ -498,7 +484,7 @@ def decode(
return tiff_header + data


def decodeStreamData(stream: Any) -> Union[str, bytes]: # utils.StreamObject
def decode_stream_data(stream: Any) -> Union[str, bytes]: # utils.StreamObject
filters = stream.get(SA.FILTER, ())

if len(filters) and not isinstance(filters[0], NameObject):
Expand Down Expand Up @@ -537,6 +523,11 @@ def decodeStreamData(stream: Any) -> Union[str, bytes]: # utils.StreamObject
return data


def decodeStreamData(stream: Any) -> Union[str, bytes]:
deprecate_with_replacement("decodeStreamData", "decode_stream_data", "4.0.0")
return decode_stream_data(stream)


def _xobj_to_image(x_object_obj: Dict[str, Any]) -> Tuple[Optional[str], bytes]:
"""
Users need to have the pillow package installed.
Expand Down
4 changes: 2 additions & 2 deletions PyPDF2/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ def decodedSelf(self, value: DecodedStreamObject) -> None: # pragma: no cover
self.decoded_self = value

def get_data(self) -> Union[None, str, bytes]:
from .filters import decodeStreamData
from .filters import decode_stream_data

if self.decoded_self is not None:
# cached version of decoded object
Expand All @@ -1095,7 +1095,7 @@ def get_data(self) -> Union[None, str, bytes]:
# create decoded object
decoded = DecodedStreamObject()

decoded._data = decodeStreamData(self)
decoded._data = decode_stream_data(self)
for key, value in list(self.items()):
if key not in (SA.LENGTH, SA.FILTER, SA.DECODE_PARMS):
decoded[key] = value
Expand Down

0 comments on commit e983e22

Please sign in to comment.