Merge pull request #257 from yatintaluja/fix-245

[MRG] Fix AttributeError for encrypted files
pull/2/head v0.7.2
Yatin Taluja 2019-01-16 16:55:31 +05:30 committed by GitHub
commit 8ea4ec3de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions

View File

@ -4,6 +4,14 @@ Release History
master master
------ ------
0.7.2 (2019-01-10)
------------------
**Bugfixes**
* [#245](https://github.com/socialcopsdev/camelot/issues/245) Fix AttributeError for encrypted files. [#251](https://github.com/socialcopsdev/camelot/pull/251) by Yatin Taluja.
0.7.1 (2019-01-06) 0.7.1 (2019-01-06)
------------------ ------------------

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
VERSION = (0, 7, 1) VERSION = (0, 7, 2)
PRERELEASE = None # alpha, beta or rc PRERELEASE = None # alpha, beta or rc
REVISION = None REVISION = None

View File

@ -33,13 +33,14 @@ class PDFHandler(object):
self.filepath = filepath self.filepath = filepath
if not filepath.lower().endswith('.pdf'): if not filepath.lower().endswith('.pdf'):
raise NotImplementedError("File format not supported") raise NotImplementedError("File format not supported")
self.pages = self._get_pages(self.filepath, pages)
if password is None: if password is None:
self.password = '' self.password = ''
else: else:
self.password = password self.password = password
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
self.password = self.password.encode('ascii') self.password = self.password.encode('ascii')
self.pages = self._get_pages(self.filepath, pages)
def _get_pages(self, filepath, pages): def _get_pages(self, filepath, pages):
"""Converts pages string to list of ints. """Converts pages string to list of ints.