Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py26 fix for RomStr.load_labels (json)

This commit is contained in:
Bryan Bishop 2013-01-27 17:14:55 -06:00
parent db5208b41f
commit 9e9c37f577
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/romstr.py
View File

@ -4,9 +4,13 @@ import sys
import os import os
import time import time
import datetime import datetime
import json
from ctypes import c_int8 from ctypes import c_int8
from copy import copy from copy import copy
import json
# New versions of json don't have read anymore.
if not hasattr(json, "read"):
json.read = json.loads
from labels import ( from labels import (
get_label_from_line, get_label_from_line,
@ -100,7 +104,7 @@ class RomStr(str):
file_handler.close() file_handler.close()
# load the labels from the file # load the labels from the file
self.labels = json.loads(open(filename, "r").read()) self.labels = json.read(open(filename, "r").read())
def get_address_for(self, label): def get_address_for(self, label):
""" Returns the address of a label. This is slow and could be improved """ Returns the address of a label. This is slow and could be improved