From 4103bc09a4326a4ffd8d2dbc60a01d256d18b1f7 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 3 Nov 2010 18:18:43 +0000 Subject: Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER response, instead of raising an exception. --- Lib/nntplib.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Lib/nntplib.py') diff --git a/Lib/nntplib.py b/Lib/nntplib.py index b067d6b3df..fde339a7f3 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -205,11 +205,12 @@ def _parse_overview(lines, fmt, data_process_func=None): is_metadata = field_name.startswith(':') if i >= n_defaults and not is_metadata: # Non-default header names are included in full in the response - h = field_name + ":" - if token[:len(h)].lower() != h: + # (unless the field is totally empty) + h = field_name + ": " + if token and token[:len(h)].lower() != h: raise NNTPDataError("OVER/XOVER response doesn't include " "names of additional headers") - token = token[len(h):].lstrip(" ") + token = token[len(h):] if token else None fields[fmt[i]] = token overview.append((article_number, fields)) return overview -- cgit v1.2.1