gyp: Python 3 Windows fixes

PR-URL: #1843
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <r@va.gg>
Reviewed-By: Matt Cowley <me@mattcowley.co.uk>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

Author: joaocgreis

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.

.travis.yml

@@ -64,10 +64,6 @@ matrix:
 allow_failures:
  - os: osx
 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
- - env: >-
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
- EXPERIMENTAL_NODE_GYP_PYTHON3=1
 install:
 #- pip install -r requirements.txt
  - pip install flake8 # pytest # add another testing frameworks later

gyp/pylib/gyp/MSVSNew.py

@@ -45,7 +45,7 @@ def MakeGuid(name, seed='msvs_new'):
  not change when the project for a target is rebuilt.
  """
 # Calculate a MD5 signature for the seed and name.
-d=hashlib.md5(str(seed) +str(name)).hexdigest().upper()
+d=hashlib.md5((str(seed) +str(name)).encode('utf-8')).hexdigest().upper()
 # Convert most of the signature to GUID form (discard the rest)
 guid= ('{'+d[:8] +'-'+d[8:12] +'-'+d[12:16] +'-'+d[16:20]
 +'-'+d[20:32] +'}')

gyp/pylib/gyp/common.py

@@ -394,6 +394,9 @@ def close(self):
 os.unlink(self.tmp_path)
 raise
 
+defwrite(self, s):
+self.tmp_file.write(s.encode('utf-8'))
+
 returnWriter()
 
 

gyp/pylib/gyp/easy_xml.py

@@ -120,7 +120,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 default_encoding=locale.getdefaultlocale()[1]
 ifdefault_encoding.upper() !=encoding.upper():
-xml_string=xml_string.decode(default_encoding).encode(encoding)
+xml_string=xml_string.encode(encoding)
 
 # Get the old content
 try:
@@ -132,7 +132,7 @@ def WriteXmlIfChanged(content, path, encoding='utf-8', pretty=False,
 
 # It has changed, write it
 ifexisting!=xml_string:
-f=open(path, 'w')
+f=open(path, 'wb')
 f.write(xml_string)
 f.close()
 

gyp/pylib/gyp/generator/msvs.py

@@ -1753,8 +1753,8 @@ def _CollapseSingles(parent, node):
 # such projects up one level.
 if (type(node) ==dictand
 len(node) ==1and
-node.keys()[0] ==parent+'.vcproj'):
-returnnode[node.keys()[0]]
+list(node)[0] ==parent+'.vcproj'):
+returnnode[list(node)[0]]
 iftype(node) !=dict:
 returnnode
 forchildinnode:
@@ -1773,8 +1773,8 @@ def _GatherSolutionFolders(sln_projects, project_objects, flat):
 # Walk down from the top until we hit a folder that has more than one entry.
 # In practice, this strips the top-level "src/" dir from the hierarchy in
 # the solution.
-whilelen(root) ==1andtype(root[root.keys()[0]]) ==dict:
-root=root[root.keys()[0]]
+whilelen(root) ==1andtype(root[list(root)[0]]) ==dict:
+root=root[list(root)[0]]
 # Collapse singles.
 root=_CollapseSingles('', root)
 # Merge buckets until everything is a root entry.