Update easy_xml.py

jfhenriques · jfhenriques · commit 9f3a1b2ce62d · 2013-12-17T21:14:18.000Z
Better handling of encoding
diff --git a/gyp/pylib/gyp/easy_xml.py b/gyp/pylib/gyp/easy_xml.py
@@ -115,6 +115,11 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
   xml_string = XmlToString(content, encoding, pretty)
   if win32 and os.linesep != '\r\n':
     xml_string = xml_string.replace('\n', '\r\n')
+    
+  try:
+    xml_string = xml_string.encode(encoding)
+  except Exception:
+    xml_string = unicode(xml_string, 'latin-1').encode(encoding)
 
   # Get the old content
   try:
@@ -127,11 +132,6 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
   # It has changed, write it
   if existing != xml_string:
     f = open(path, 'w')
-    try:
-      dec = unicode(xml_string, 'latin-1').encode('utf-8')
-      xml_string = dec
-    except Exception as inst:
-      pass
     f.write(xml_string)
     f.close()
 
