~ubuntu-branches/debian/experimental/calibre/experimental

« back to all changes in this revision

Viewing changes to src/calibre/ebooks/metadata/zip.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-03-03 22:02:28 UTC
  • mfrom: (1.3.31)
  • Revision ID: package-import@ubuntu.com-20120303220228-kcahn2y83sh71bgh
Tags: 0.8.41+dfsg-1
* New upstream release.
* debian/control: Add libpoppler-private-dev build dependency, thanks Pino
  Toscano. (Closes: #660114)

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
    from calibre.ebooks.metadata.opf2 import OPF
45
45
    if hasattr(opfpath, 'read'):
46
46
        f = opfpath
47
 
        opfpath = getattr(f, 'name', os.getcwd())
 
47
        opfpath = getattr(f, 'name', os.getcwdu())
48
48
    else:
49
49
        f = open(opfpath, 'rb')
50
50
    opf = OPF(f, os.path.dirname(opfpath))