From 68f34c1cd0c2e591603cd0ed0ecaac7ff9f3cbd9 Mon Sep 17 00:00:00 2001 From: Martin Thoma Date: Thu, 30 Jun 2022 07:46:55 +0200 Subject: [PATCH 1/2] PI: Remove b_ call in FloatObject.write_to_stream --- PyPDF2/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyPDF2/generic.py b/PyPDF2/generic.py index 3cc7cd1cf..5f948c4fa 100644 --- a/PyPDF2/generic.py +++ b/PyPDF2/generic.py @@ -331,7 +331,7 @@ def as_numeric(self) -> float: def write_to_stream( self, stream: StreamType, encryption_key: Union[None, str, bytes] ) -> None: - stream.write(b_(repr(self))) + stream.write(repr(self).encode("utf8")) def writeToStream( self, stream: StreamType, encryption_key: Union[None, str, bytes] From 574b334763e39be256cb90041db08c29671c98af Mon Sep 17 00:00:00 2001 From: Martin Thoma Date: Thu, 30 Jun 2022 08:01:32 +0200 Subject: [PATCH 2/2] Kill more --- PyPDF2/_writer.py | 4 ++-- PyPDF2/generic.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PyPDF2/_writer.py b/PyPDF2/_writer.py index 7529f504e..1fb0cb779 100644 --- a/PyPDF2/_writer.py +++ b/PyPDF2/_writer.py @@ -719,8 +719,8 @@ def encrypt( keylen = int(40 / 8) P = permissions_flag O = ByteStringObject(_alg33(owner_pwd, user_pwd, rev, keylen)) - ID_1 = ByteStringObject(md5(b_(repr(time.time()))).digest()) - ID_2 = ByteStringObject(md5(b_(repr(random.random()))).digest()) + ID_1 = ByteStringObject(md5((repr(time.time())).encode("utf8")).digest()) + ID_2 = ByteStringObject(md5((repr(random.random())).encode("utf8")).digest()) self._ID = ArrayObject((ID_1, ID_2)) if rev == 2: U, key = _alg34(user_pwd, O, P, ID_1) diff --git a/PyPDF2/generic.py b/PyPDF2/generic.py index 5f948c4fa..e092c4aa4 100644 --- a/PyPDF2/generic.py +++ b/PyPDF2/generic.py @@ -326,7 +326,7 @@ def __repr__(self) -> str: return o def as_numeric(self) -> float: - return float(b_(repr(self))) + return float(repr(self).encode("utf8")) def write_to_stream( self, stream: StreamType, encryption_key: Union[None, str, bytes] @@ -351,12 +351,12 @@ def __new__(cls, value: Any) -> "NumberObject": return int.__new__(cls, 0) def as_numeric(self) -> int: - return int(b_(repr(self))) + return int(repr(self).encode("utf8")) def write_to_stream( self, stream: StreamType, encryption_key: Union[None, str, bytes] ) -> None: - stream.write(b_(repr(self))) + stream.write(repr(self).encode("utf8")) def writeToStream( self, stream: StreamType, encryption_key: Union[None, str, bytes]