From be6dab8857f87cd0351ac4f7d40d93506921cd8a Mon Sep 17 00:00:00 2001 From: 117503445 Date: Sun, 23 Jul 2023 14:49:05 +0800 Subject: [PATCH 1/4] fix: codec error message Signed-off-by: 117503445 --- pdfminer/converter.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pdfminer/converter.py b/pdfminer/converter.py index 8e48d86a..4969182e 100644 --- a/pdfminer/converter.py +++ b/pdfminer/converter.py @@ -409,8 +409,10 @@ def __init__( ) # write() assumes a codec for binary I/O, or no codec for text I/O. - if self.outfp_binary == (not self.codec): + if self.outfp_binary and not self.codec: raise ValueError("Codec is required for a binary I/O output") + if not self.outfp_binary and self.codec: + raise ValueError("Codec is not required for a text I/O output") if text_colors is None: text_colors = {"char": "black"} From 9ae857cf8ecd6a0b77e171ea264bb6f573b82430 Mon Sep 17 00:00:00 2001 From: 117503445 Date: Sun, 23 Jul 2023 15:01:04 +0800 Subject: [PATCH 2/4] doc: changelog Signed-off-by: 117503445 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ffbe882..5cadc2d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Color "convenience operators" now (per spec) also set color space ([#794](https://github.com/pdfminer/pdfminer.six/pull/794)) - `ValueError` when extracting images, due to breaking changes in Pillow ([#827](https://github.com/pdfminer/pdfminer.six/pull/827)) - Small typo's and issues in the documentation ([#828](https://github.com/pdfminer/pdfminer.six/pull/828)) +- `ValueError` wrong error message when codec for text output ([#901](https://github.com/pdfminer/pdfminer.six/issues/901)) ### Deprecated From aa91f58b67b2b5549737f7fe7ebc0738a07e2f43 Mon Sep 17 00:00:00 2001 From: Pieter Marsman Date: Mon, 1 Jan 2024 20:19:02 +0100 Subject: [PATCH 3/4] Fix chnagelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9e3d79..d3642f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Resolving mediabox and pdffont ([#834](https://github.com/pdfminer/pdfminer.six/pull/834)) - Keywords that aren't terminated by the pattern `END_KEYWORD` before end-of-stream are parsed ([#885](https://github.com/pdfminer/pdfminer.six/pull/885)) -- `ValueError` wrong error message when codec for text output ([#901](https://github.com/pdfminer/pdfminer.six/issues/901)) +- `ValueError` wrong error message when specifying codec for text output ([#902](https://github.com/pdfminer/pdfminer.six/pull/902)) ## [20231228] From 1db89c3ef64f8749e3a6d5abc243b1746f4e7cc1 Mon Sep 17 00:00:00 2001 From: Pieter Marsman Date: Mon, 1 Jan 2024 20:19:17 +0100 Subject: [PATCH 4/4] Require no codec on text output --- pdfminer/converter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pdfminer/converter.py b/pdfminer/converter.py index 4969182e..9cc2ac5f 100644 --- a/pdfminer/converter.py +++ b/pdfminer/converter.py @@ -412,7 +412,7 @@ def __init__( if self.outfp_binary and not self.codec: raise ValueError("Codec is required for a binary I/O output") if not self.outfp_binary and self.codec: - raise ValueError("Codec is not required for a text I/O output") + raise ValueError("Codec must not be specified for a text I/O output") if text_colors is None: text_colors = {"char": "black"}