Merge branch 'main' into missing-bookmark

MartinThoma · web-flow · commit ce70b1cb2832 · 2022-06-23T21:20:39.000+02:00
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ testtype:
 mutation-test:
 	mutmut run
 
-mutmut-results:
+mutation-results:
 	mutmut junitxml --suspicious-policy=ignore --untested-policy=ignore > mutmut-results.xml
 	junit2html mutmut-results.xml mutmut-results.html
 
diff --git a/PyPDF2/_writer.py b/PyPDF2/_writer.py
@@ -1339,7 +1339,7 @@ def add_uri(
     ) -> None:
         """
         Add an URI from a rectangular area to the specified page.
-        This uses the basic structure of AddLink
+        This uses the basic structure of :meth:`add_link`
 
         :param int pagenum: index of the page on which to place the URI action.
         :param int uri: string -- uri of resource to link to.
@@ -1349,9 +1349,6 @@ def add_uri(
         :param border: if provided, an array describing border-drawing
             properties. See the PDF spec for details. No border will be
             drawn if this argument is omitted.
-
-        REMOVED FIT/ZOOM ARG
-        -John Mulligan
         """
 
         page_link = self.get_object(self._pages)[PA.KIDS][pagenum]  # type: ignore
diff --git a/PyPDF2/generic.py b/PyPDF2/generic.py
@@ -565,7 +565,11 @@ def write_to_stream(
             stream.write(b"(")
             for c in bytearr:
                 if not chr(c).isalnum() and c != b" ":
-                    stream.write(b_(rf"\{c:0>3o}"))
+                    # This:
+                    #   stream.write(b_(rf"\{c:0>3o}"))
+                    # gives
+                    #   https://github.com/davidhalter/parso/issues/207
+                    stream.write(b_("\\%03o" % c))
                 else:
                     stream.write(b_(chr(c)))
             stream.write(b")")
diff --git a/README.md b/README.md
@@ -27,6 +27,14 @@ You can install PyPDF2 via pip:
 pip install PyPDF2
 ```
 
+If you plan to use PyPDF2 for encrypting or decrypting PDFs that use AES, you
+will need to install some extra dependencies. Encryption using RC4 is supported
+using the regular installation.
+
+```
+pip install PyPDF2[crypto]
+```
+
 ## Usage
 
 ```python
diff --git a/docs/user/encryption-decryption.md b/docs/user/encryption-decryption.md
@@ -1,5 +1,9 @@
 # Encryption and Decryption of PDFs
 
+Please see the note in the
+[Installation doc](https://pypdf2.readthedocs.io/en/latest/user/installation.html)
+for installing the extra dependencies if interacting with PDFs that use AES.
+
 ## Encrypt
 
 Add a password to a PDF (encrypt it):
diff --git a/docs/user/installation.md b/docs/user/installation.md
@@ -20,6 +20,14 @@ install PyPDF2 for your current user:
 pip install --user PyPDF2
 ```
 
+If you plan to use PyPDF2 for encrypting or decrypting PDFs that use AES, you
+will need to install some extra dependencies. Encryption using RC4 is supported
+using the regular installation.
+
+```
+pip install PyPDF2[crypto]
+```
+
 ## Anaconda
 
 Anaconda users can [install PyPDF2 via conda-forge](https://anaconda.org/conda-forge/pypdf2).
diff --git a/mutmut-test.sh b/mutmut-test.sh
@@ -1,2 +1,3 @@
 #!/bin/bash -e
 pytest -x
+mypy PyPDF2 --show-error-codes --disallow-untyped-defs --disallow-incomplete-defs --ignore-missing-imports
diff --git a/tests/test_writer.py b/tests/test_writer.py
@@ -291,6 +291,7 @@ def test_encrypt(use_128bit):
 
     reader = PdfReader(tmp_filename, password="userpwd")
     new_text = reader.pages[0].extract_text()
+    assert reader.metadata.get("/Producer") == "PyPDF2"
 
     assert new_text == orig_text
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#!/bin/bash -e`
`2`	`2`	`pytest -x`
	`3`	`+mypy PyPDF2 --show-error-codes --disallow-untyped-defs --disallow-incomplete-defs --ignore-missing-imports`