From 5dee3725603e6068ef41ec5320be3c186a5364f2 Mon Sep 17 00:00:00 2001
From: Wayne Warren <waynr+launchpad@sdf.org>
Date: Sun, 3 Jan 2016 22:12:04 -0800
Subject: [PATCH] Remove Python 2.6 compatibility patch.

Since we don't test or claim to support Python 2.6, remove this patch.

Change-Id: Ic1c20dd290393a6a7723d5b97302cbc3707c7659
---
 jenkins_jobs/xml_config.py | 39 --------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/jenkins_jobs/xml_config.py b/jenkins_jobs/xml_config.py
index e5665c880..2e74f5343 100644
--- a/jenkins_jobs/xml_config.py
+++ b/jenkins_jobs/xml_config.py
@@ -16,49 +16,10 @@
 # Manage Jenkins XML config file output.
 
 import hashlib
-import sys
-import xml
 from xml.dom import minidom
 import xml.etree.ElementTree as XML
 
 
-# Python 2.6's minidom toprettyxml produces broken output by adding extraneous
-# whitespace around data. This patches the broken implementation with one taken
-# from Python > 2.7.3
-def writexml(self, writer, indent="", addindent="", newl=""):
-    # indent = current indentation
-    # addindent = indentation to add to higher levels
-    # newl = newline string
-    writer.write(indent + "<" + self.tagName)
-
-    attrs = self._get_attributes()
-    a_names = attrs.keys()
-    a_names.sort()
-
-    for a_name in a_names:
-        writer.write(" %s=\"" % a_name)
-        minidom._write_data(writer, attrs[a_name].value)
-        writer.write("\"")
-    if self.childNodes:
-        writer.write(">")
-        if (len(self.childNodes) == 1 and
-                self.childNodes[0].nodeType == minidom.Node.TEXT_NODE):
-            self.childNodes[0].writexml(writer, '', '', '')
-        else:
-            writer.write(newl)
-            for node in self.childNodes:
-                node.writexml(writer, indent + addindent, addindent, newl)
-            writer.write(indent)
-        writer.write("</%s>%s" % (self.tagName, newl))
-    else:
-        writer.write("/>%s" % (newl))
-
-# PyXML xml.__name__ is _xmlplus. Check that if we don't have the default
-# system version of the minidom, then patch the writexml method
-if sys.version_info[:3] < (2, 7, 3) or xml.__name__ != 'xml':
-    minidom.Element.writexml = writexml
-
-
 def remove_ignorable_whitespace(node):
     """Remove insignificant whitespace from XML nodes