Merge pull request #257 from yatintaluja/fix-245

[MRG] Fix AttributeError for encrypted files
atlanhq · Jan 16, 2019 · 8ea4ec3 · 8ea4ec3
2 parents 45ae980 + 6c4b468
commit 8ea4ec3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -4,6 +4,14 @@ Release History
 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)
 ------------------
 

diff --git a/camelot/__version__.py b/camelot/__version__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-VERSION = (0, 7, 1)
+VERSION = (0, 7, 2)
 PRERELEASE = None # alpha, beta or rc
 REVISION = None
 

diff --git a/camelot/handlers.py b/camelot/handlers.py
@@ -33,13 +33,14 @@ def __init__(self, filepath, pages='1', password=None):
         self.filepath = filepath
         if not filepath.lower().endswith('.pdf'):
             raise NotImplementedError("File format not supported")
-        self.pages = self._get_pages(self.filepath, pages)
+
         if password is None:
             self.password = ''
         else:
             self.password = password
             if sys.version_info[0] < 3:
                 self.password = self.password.encode('ascii')
+        self.pages = self._get_pages(self.filepath, pages)
 
     def _get_pages(self, filepath, pages):
         """Converts pages string to list of ints.