From 155c1eddae56a64d293613b3e1c9f85d4aefe170 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 19 Dec 2012 11:16:42 +0100 Subject: [PATCH] Debug message with declared page charset --- lib/request/basic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/request/basic.py b/lib/request/basic.py index 27921ce59..c75ed64ef 100644 --- a/lib/request/basic.py +++ b/lib/request/basic.py @@ -222,9 +222,11 @@ def decodePage(page, contentEncoding, contentType): metaCharset = checkCharEncoding(extractRegexResult(META_CHARSET_REGEX, page)) - if ((httpCharset or metaCharset) and not all([httpCharset, metaCharset]))\ - or (httpCharset == metaCharset and all([httpCharset, metaCharset])): + if (any((httpCharset, metaCharset)) and not all((httpCharset, metaCharset)))\ + or (httpCharset == metaCharset and all((httpCharset, metaCharset))): kb.pageEncoding = httpCharset or metaCharset + debugMsg = "declared web page charset '%s'" % kb.pageEncoding + singleTimeLogMessage(debugMsg, logging.DEBUG, debugMsg) else: kb.pageEncoding = None else: