Skip to content

Commit

Permalink
Fix getObject on missing '/Annots'
Browse files Browse the repository at this point in the history

Traceback (most recent call last):
  File "/home/edegoute/Repositories/proxy.pdf/proxy/pdf/views.py", line 224, in generatePdf
    watermark(tmp_prince_output.name, tmp_specimen_output.name)
  File "/home/edegoute/Repositories/proxy.pdf/proxy/pdf/watermark.py", line 15, in watermark
    page.mergePage(watermark.getPage(0))
  File "/home/edegoute/Repositories/proxy.pdf/eggs/PyPDF3-1.0.1-py2.7.egg/PyPDF3/pdf.py", line 2380, in mergePage
    self._mergePage(page2)
  File "/home/edegoute/Repositories/proxy.pdf/eggs/PyPDF3-1.0.1-py2.7.egg/PyPDF3/pdf.py", line 2395, in _mergePage
    annots = page["/Annots"]
  File "/home/edegoute/Repositories/proxy.pdf/eggs/PyPDF3-1.0.1-py2.7.egg/PyPDF3/generic.py", line 518, in __getitem__
    return dict.__getitem__(self, key).getObject()
  File "/home/edegoute/Repositories/proxy.pdf/eggs/PyPDF3-1.0.1-py2.7.egg/PyPDF3/generic.py", line 179, in getObject
    return self.pdf.getObject(self).getObject()
AttributeError: 'NoneType' object has no attribute 'getObject'
  • Loading branch information
encolpe authored Nov 28, 2019
1 parent 3546d56 commit d55405a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions PyPDF3/pdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -1749,8 +1749,9 @@ def getObject(self, indirectReference):
else:
warnings.warn("Object %d %d not defined." % (indirectReference.idnum,
indirectReference.generation), utils.PdfReadWarning)
# if self.strict:
raise utils.PdfReadError("Could not find object.")
if self.strict:
raise utils.PdfReadError("Could not find object.")

self.cacheIndirectObject(indirectReference.generation,
indirectReference.idnum, retval)
return retval
Expand Down Expand Up @@ -2392,7 +2393,7 @@ def _mergePage(self, page2, page2transformation=None, ctm=None, expand=False):

for page in (self, page2):
if "/Annots" in page:
annots = page["/Annots"]
annots = page.get('/Annots')
if isinstance(annots, ArrayObject):
for ref in annots:
newAnnots.append(ref)
Expand Down

0 comments on commit d55405a

Please sign in to comment.