Compare binary ROM data using binary datatype without string conversion

Author: Fayvel Victor

src/m64py/archive.py

@@ -21,6 +21,7 @@
 import shutil
 import tempfile
 from subprocess import Popen, PIPE
+import binascii
 
 from m64py.utils import which
 
@@ -47,9 +48,9 @@
 if HAS_7Z or LZMA_CMD: EXT_FILTER += " *.7z"
 
 ROM_TYPE = {
-    '80371240': 'z64 (native)',
-    '37804012': 'v64 (byteswapped)',
-    '40123780': 'n64 (wordswapped)'
+    b'80371240': 'z64 (native)',
+    b'37804012': 'v64 (byteswapped)',
+    b'40123780': 'n64 (wordswapped)'
 }
 
 
@@ -153,17 +154,17 @@ def get_filetype(self):
         fd = open(self.file, "rb")
         magic = fd.read(4)
         fd.close()
-        if magic == 'PK\03\04':
+        if magic == b'PK\03\04':
             return ZIP
-        elif magic.startswith('\037\213'):
+        elif magic.startswith(b'\037\213'):
             return GZIP
-        elif magic.startswith('BZh'):
+        elif magic.startswith(b'BZh'):
             return BZIP
-        elif magic == 'Rar!':
+        elif magic == b'Rar!':
             return RAR
-        elif magic == '7z\xbc\xaf':
+        elif magic == b'7z\xbc\xaf':
             return LZMA
-        elif magic.encode('hex') in ROM_TYPE.keys():
+        elif binascii.hexlify(magic) in ROM_TYPE.keys():
             return ROM
         return None
 

src/m64py/core/core.py

@@ -19,6 +19,7 @@
 import signal
 import ctypes as C
 import subprocess
+import binascii
 
 from m64py.core.defs import *
 from m64py.core.config import Config
@@ -295,7 +296,7 @@ def detach_plugins(self):
     def rom_open(self, romfile):
         """Reads in a binary ROM image"""
         self.rom_length = len(romfile)
-        self.rom_type = ROM_TYPE[romfile[:4].encode('hex')]
+        self.rom_type = ROM_TYPE[binascii.hexlify(romfile[:4])]
         romlength = C.c_int(self.rom_length)
         rombuffer = C.c_buffer(romfile)
         rval = self.m64p.CoreDoCommand(