Merge pull request #1543 from comex/utf8-issues

stupid utf-8 stuff

Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp

@@ -46,7 +46,7 @@ UCodeInterface* UCodeFactory(u32 crc, DSPHLE *dsphle, bool wii)
 	                 // nddemo, Star Fox
 	case 0x07f88145: // bustamove, Ikaruga, F-Zero GX, Robotech Battle Cry, Star Soldier, Soul Calibur 2,
 		// Zelda:OOT, Tony Hawk, Viewtiful Joe
-	case 0xe2136399: // Billy Hatcher, Dragon Ball Z, Mario Party 5, TMNT, 1080° Avalanche
+	case 0xe2136399: // Billy Hatcher, Dragon Ball Z, Mario Party 5, TMNT, 1080° Avalanche
 	case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy)
 		INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", crc);
 		return new AXUCode(dsphle, crc);

Tools/check-includes.py

@@ -76,7 +76,16 @@ def show_differences(bad, good):
 
 def check_file(path):
     print('Checking %s' % path)
-    lines = (l.strip() for l in open(path).read().split('\n'))
+    try:
+        try:
+            data = open(path, encoding='utf-8').read()
+        except TypeError: # py2
+            data = open(path).read().decode('utf-8')
+    except UnicodeDecodeError:
+        sys.stderr.write('%s: bad UTF-8 data\n' % path)
+        return
+
+    lines = (l.strip() for l in data.split('\n'))
     lines = exclude_if_blocks(lines)
     includes = list(filter_includes(lines))
     sorted_includes = sort_includes(includes)