use os.path.join instead of cowboying it

This commit is contained in:
Bryan Bishop 2012-07-01 08:55:21 -05:00
parent 86cb61dbe8
commit b85d9b86ad

View File

@ -50,7 +50,7 @@ class RomStr(str):
""" Loads labels from labels.json, or parses the source code file and """ Loads labels from labels.json, or parses the source code file and
generates new labels. generates new labels.
""" """
filename = os.path.dirname(__file__) + "/" + filename filename = os.path.join(os.path.dirname(__file__), filename)
# blank out the hash # blank out the hash
self.labels = {} self.labels = {}
@ -75,7 +75,7 @@ class RomStr(str):
# scan the asm source code for labels # scan the asm source code for labels
if generate_labels: if generate_labels:
asm = open(os.path.dirname(__file__) + "/../main.asm", "r").read().split("\n") asm = open(os.path.join(os.path.dirname(__file__), "../main.asm"), "r").read().split("\n")
for line in asm: for line in asm:
label = get_label_from_line(line) label = get_label_from_line(line)