Merge pull request #1277 from nexB/806-new-pdfminer.six

Use new official release of pdfminer.six #806

Author: pombredanne

src/typecode/contenttype.py

@@ -36,6 +36,7 @@
 from pdfminer.pdfparser import PDFParser
 from pdfminer.pdfdocument import PDFDocument
 from pdfminer.pdfparser import PDFSyntaxError
+from pdfminer.psparser import PSSyntaxError
 from pdfminer.pdfdocument import PDFEncryptionError
 from pdfminer.pdftypes import PDFException
 
@@ -489,7 +490,7 @@ def is_pdf_with_text(self):
                         with contextlib.closing(PDFParser(pf)) as parser:
                             doc = PDFDocument(parser)
                             self._is_pdf_with_text = doc.is_extractable
-                    except (PDFSyntaxError, PDFException, PDFEncryptionError):
+                    except (PDFSyntaxError, PSSyntaxError, PDFException, PDFEncryptionError):
                         self._is_pdf_with_text = False
         return self._is_pdf_with_text