update: pyPdf to PyPDF2 (fixes #11)

metaist · May 2, 2014 · 8be13f0 · 8be13f0
1 parent 24981cf
commit 8be13f0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -43,9 +43,6 @@
       <arg value="install" />
       <arg value="-r"/>
       <arg value="requirements.txt"/>
-      <arg value="--allow-all-external"/>
-      <arg value="--allow-unverified"/>
-      <arg value="pyPDF"/>
     </exec>
   </target>
 

diff --git a/pdfmerge.py b/pdfmerge.py
@@ -11,15 +11,15 @@
 import os
 import re
 
-from pyPdf import PdfFileWriter, PdfFileReader
+from PyPDF2 import PdfFileWriter, PdfFileReader
 
 __author__ = 'The Metaist'
-__copyright__ = 'Copyright 2013, Metaist'
+__copyright__ = 'Copyright 2014, Metaist'
 __email__ = '[email protected]'
 __license__ = 'MIT'
 __maintainer__ = 'The Metaist'
 __status__ = 'Prototype'
-__version__ = '0.0.4'
+__version__ = '0.0.5'
 __version_info__ = tuple(__version__.split('.'))
 
 ERROR_PATH = 'ERROR: path not found: {0}'

diff --git a/releases/pdfmerge-0.0.5-setup.exe b/releases/pdfmerge-0.0.5-setup.exe
diff --git a/releases/pdfmerge-0.0.5.zip b/releases/pdfmerge-0.0.5.zip
diff --git a/releases/pdfmerge-latest-setup.exe b/releases/pdfmerge-latest-setup.exe
diff --git a/releases/pdfmerge-latest.zip b/releases/pdfmerge-latest.zip
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,4 @@ nose>=1.2.1
 pep8>=1.4.4
 # py2exe>=0.6.9 # uncomment on Windows machines
 pylint>=0.26.0
-pyPdf>=1.13
+PyPDF2>=1.21