tools: fix GYP MSVS solution generator for Python 3

targos · targos · commit 59033f618aa6 · 2019-11-10T14:50:09.000+01:00
PR-URL: #29897 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
diff --git a/tools/gyp/pylib/gyp/MSVSNew.py b/tools/gyp/pylib/gyp/MSVSNew.py
@@ -7,6 +7,7 @@
 import hashlib
 import os
 import random
+from operator import attrgetter
 
 import gyp.common
 
@@ -86,7 +87,7 @@ def __init__(self, path, name = None, entries = None,
     self.guid = guid
 
     # Copy passed lists (or set to empty lists)
-    self.entries = sorted(list(entries or []))
+    self.entries = sorted(entries or [], key=attrgetter('path'))
     self.items = list(items or [])
 
     self.entry_type_guid = ENTRY_TYPE_GUIDS['folder']
@@ -230,7 +231,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
       if isinstance(e, MSVSFolder):
         entries_to_check += e.entries
 
-    all_entries = sorted(all_entries)
+    all_entries = sorted(all_entries, key=attrgetter('path'))
 
     # Open file and print header
     f = writer(self.path)
