use new pdf lib

product/ERP5/Document/PDFDocument.py

@@ -81,7 +81,11 @@ class PDFDocument(Image):
     * Watermark is applied at all pages starting watermark_start_page (this
       index is 0 based)
     """
-    from pyPdf import PdfFileWriter, PdfFileReader
+    try:
+      from PyPDF2 import PdfFileWriter, PdfFileReader
+    except ImportError:
+      pass
+    else:
       if not watermark_data:
         raise ValueError("watermark_data cannot not be empty")
       if not self.hasData():
@@ -301,12 +305,12 @@ class PDFDocument(Image):
         value = ':'.join(item_list[1:]).strip()
         result[key] = value
 
-      # Then we use pyPdf to get extra metadata
+      # Then we use PyPDF2 to get extra metadata
       try:
-        from pyPdf import PdfFileReader
-        from pyPdf.utils import PdfReadError
+        from PyPDF2 import PdfFileReader
+        from PyPDF2.utils import PdfReadError
       except ImportError:
-        # if pyPdf not found, pass
+        # if PyPDF2 not found, pass
         pass
       else:
         try:
@@ -327,7 +331,7 @@ class PDFDocument(Image):
               result.setdefault(info_key, info_value)
         except PdfReadError:
           LOG("PDFDocument.getContentInformation", PROBLEM,
-            "pyPdf is Unable to read PDF, probably corrupted PDF here : %s" % \
+            "PyPDF2 is Unable to read PDF, probably corrupted PDF here : %s" % \
             (self.getRelativeUrl(),))
     finally:
       tmp.close()