Merge branch 'master' of github.com:danielquinn/paperless

This commit is contained in:
Daniel Quinn 2018-02-01 16:04:57 +00:00
commit 5e40227bc3
3 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ pdftotext>=2.0.1
# For the tests # For the tests
factory-boy factory-boy
pytest pytest==3.3.2 # Newer versions break with pytest-sugar
pytest-django pytest-django
pytest-sugar pytest-sugar
pytest-env pytest-env

View File

@ -1 +1 @@
__version__ = (1, 1, 0) __version__ = (1, 2, 0)

View File

@ -235,6 +235,6 @@ def get_text_from_pdf(pdf_file):
try: try:
pdf = pdftotext.PDF(f) pdf = pdftotext.PDF(f)
except pdftotext.Error: except pdftotext.Error:
return False return ""
return "\n".join(pdf) return "\n".join(pdf)