pdf: Don't require Trapped to be a Name instance.

QuLogic · QuLogic · commit 31e462b2924f · 2020-06-02T05:30:35.000-04:00
It's something internal to the PDF backend, and there's no need to
require the metadata to use that type instead of a plain string.
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -187,8 +187,11 @@ def is_string_like(x):
     def is_date(x):
         return isinstance(x, datetime)
 
-    check_trapped = (lambda x: isinstance(x, Name) and
-                     x.name in (b'True', b'False', b'Unknown'))
+    def check_trapped(x):
+        if isinstance(x, Name):
+            return x.name in (b'True', b'False', b'Unknown')
+        else:
+            return x in ('True', 'False', 'Unknown')
 
     keywords = {
         'Title': is_string_like,
@@ -206,6 +209,8 @@ def is_date(x):
             cbook._warn_external(f'Unknown infodict keyword: {k}')
         elif not keywords[k](info[k]):
             cbook._warn_external(f'Bad value for infodict keyword {k}')
+    if 'Trapped' in info:
+        info['Trapped'] = Name(info['Trapped'])
 
     return info
 
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -262,6 +262,7 @@ def test_pdf_pages_metadata():
         'Subject': 'Test page',
         'Keywords': 'test,pdf,multipage',
         'ModDate': datetime(1968, 8, 1),
+        'Trapped': 'Unknown'
     }
 
     path = os.path.join(result_dir, 'pdfpages_meta.pdf')

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ def test_pdf_pages_metadata():`
`262`	`262`	`'Subject': 'Test page',`
`263`	`263`	`'Keywords': 'test,pdf,multipage',`
`264`	`264`	`'ModDate': datetime(1968, 8, 1),`
	`265`	`+ 'Trapped': 'Unknown'`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`path = os.path.join(result_dir, 'pdfpages_meta.pdf')`