From 89f76d3f913e0527fbcc0d15cb3c17fbf6ca8618 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Wed, 23 Sep 2015 01:14:35 +0000 Subject: Issue #25047: Respect case writing XML encoding declarations This restores the ability to write encoding names in uppercase like "UTF-8", which worked in Python 2. --- Lib/xml/etree/ElementTree.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Lib/xml/etree/ElementTree.py') diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index a8585b6e2f..97eba8bfcd 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -756,14 +756,13 @@ class ElementTree: encoding = "utf-8" else: encoding = "us-ascii" - else: - encoding = encoding.lower() - with _get_writer(file_or_filename, encoding) as write: + enc_lower = encoding.lower() + with _get_writer(file_or_filename, enc_lower) as write: if method == "xml" and (xml_declaration or (xml_declaration is None and - encoding not in ("utf-8", "us-ascii", "unicode"))): + enc_lower not in ("utf-8", "us-ascii", "unicode"))): declared_encoding = encoding - if encoding == "unicode": + if enc_lower == "unicode": # Retrieve the default encoding for the xml declaration import locale declared_encoding = locale.getpreferredencoding() -- cgit v1.2.1