From 7a1046484bc54be924e25aae9c9936d9744f159d Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Sat, 31 Jan 2015 12:26:14 +0100
Subject: [PATCH] autohelp: don't specify encoding in the base xml

Specifying the encoding and working with unicode strings in not
supported in lxml. The BASE_XML string is only used to init the XML tree
and does not need a specific encoding. The utf-8 encoding is explicitely
added when the final XML is written to file.

Change-Id: I74e0a316cf718ad9768a690f8ccc4a1cc9a9fc7e
---
 autogenerate_config_docs/autohelp.py            | 2 +-
 autogenerate_config_docs/extract_swift_flags.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogenerate_config_docs/autohelp.py b/autogenerate_config_docs/autohelp.py
index 6a7d1999..1f4b8e4e 100755
--- a/autogenerate_config_docs/autohelp.py
+++ b/autogenerate_config_docs/autohelp.py
@@ -42,7 +42,7 @@ IGNORE = ['trove.guestagent.datastore.postgresql.manager',
           'trove.guestagent.datastore.postgresql.service.users',
           'trove.guestagent.datastore.postgresql.service.database']
 
-BASE_XML = '''<?xml version="1.0" encoding="UTF-8"?>
+BASE_XML = '''<?xml version="1.0"?>
 <para xmlns="http://docbook.org/ns/docbook"
   version="5.0">
 <!-- Warning: Do not edit this file. It is automatically
diff --git a/autogenerate_config_docs/extract_swift_flags.py b/autogenerate_config_docs/extract_swift_flags.py
index 730f1a89..06dcfb6b 100644
--- a/autogenerate_config_docs/extract_swift_flags.py
+++ b/autogenerate_config_docs/extract_swift_flags.py
@@ -32,7 +32,7 @@ from autohelp import OptionsCache  # noqa
 
 DBK_NS = ".//{http://docbook.org/ns/docbook}"
 
-BASE_XML = '''<?xml version="1.0" encoding="UTF-8"?>
+BASE_XML = '''<?xml version="1.0"?>
 <para xmlns="http://docbook.org/ns/docbook"
   version="5.0">
 <!-- The tool that generated this table lives in the