Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: py-pdf/pypdf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Gluejar/PyPDF2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 2, 2014

  1. Update merger.py

    @eshellman
    eshellman committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    dae138b View commit details
    Browse the repository at this point in the history

  2. Update _version.py

    @eshellman
    eshellman committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    f076c99 View commit details
    Browse the repository at this point in the history

  3. pdf sample which breaks merger 

    /Users/eric/.virtualenvs/regluit/lib/python2.7/site-packages/PyPDF2/merg
er.pyc in append(self, fileobj, bookmark, pages, import_bookmarks)
    196         """
    197
--> 198         self.merge(len(self.pages), fileobj, bookmark, pages,
import_bookmarks)
    199
    200

/Users/eric/.virtualenvs/regluit/lib/python2.7/site-packages/PyPDF2/merg
er.pyc in merge(self, position, fileobj, bookmark, pages,
import_bookmarks)
    151
    152         dests = pdfr.namedDestinations
--> 153         dests = self._trim_dests(pdfr, dests, pages)
    154         self.named_dests += dests
    155

/Users/eric/.virtualenvs/regluit/lib/python2.7/site-packages/PyPDF2/merg
er.pyc in _trim_dests(self, pdf, dests, pages)
    299                 if pdf.getPage(j).getObject() ==
o['/Page'].getObject():
    300                     o[NameObject('/Page')] =
o['/Page'].getObject()
--> 301                     assert str(k) == str(o['/Title'])
    302                     new_dests.append(o)
    303                     break

UnicodeEncodeError: 'ascii' codec can't encode character u'\u2122' in
position 28: ordinal not in range(128)
    @eshellman
    eshellman committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    a11c7b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2014

  1. Revert "pdf sample which breaks merger" 

    This reverts commit a11c7b0.
    @eshellman
    eshellman committed Nov 23, 2014
    Configuration menu
    Copy the full SHA
    53c04b8 View commit details
    Browse the repository at this point in the history

  2. Revert "Update _version.py" 

    This reverts commit f076c99.
    @eshellman
    eshellman committed Nov 23, 2014
    Configuration menu
    Copy the full SHA
    5afb1d7 View commit details
    Browse the repository at this point in the history
Loading