Update other scripts to support Python 3 build.

A couple of scripts were not Python 3 compatible. Update smtextgen to
use print() instead of bare print, and update the texture build script
to use the correct binary mode for writing binary files.
This commit is contained in:
Simon Howard 2014-10-28 03:55:43 +00:00
parent e47b69a064
commit 02bd566362
2 changed files with 10 additions and 9 deletions

View file

@ -140,9 +140,9 @@ def parse_command_line(args):
args = parse_command_line(sys.argv[1:]) args = parse_command_line(sys.argv[1:])
if not args: if not args:
print "Usage: smtextgen <filename> <size> [...text commands...]" print("Usage: smtextgen <filename> <size> [...text commands...]")
print "Where each text command looks like:" print("Where each text command looks like:")
print " [x,y] [text]" print(" [x,y] [text]")
sys.exit(0) sys.exit(0)
smallfont = Font() smallfont = Font()

View file

@ -139,7 +139,7 @@ class TextureSet(collections.OrderedDict):
filename: Path to file in which to store the resulting filename: Path to file in which to store the resulting
lump. lump.
""" """
with open(filename, "w") as out: with open(filename, "wb") as out:
# Header indicating number of textures: # Header indicating number of textures:
out.write(struct.pack("<l", len(self))) out.write(struct.pack("<l", len(self)))
@ -152,7 +152,8 @@ class TextureSet(collections.OrderedDict):
# Write actual texture data: # Write actual texture data:
for name, texture in self.items(): for name, texture in self.items():
maptexture = struct.pack("<8slhhlh", maptexture = struct.pack("<8slhhlh",
name, 0, texture.w, texture.h, name.encode("ascii"), 0,
texture.w, texture.h,
0, len(texture.patches)) 0, len(texture.patches))
out.write(maptexture) out.write(maptexture)
@ -277,13 +278,13 @@ def write_pnames_lump(pnames, filename):
pnames: List of strings containing patch names. pnames: List of strings containing patch names.
filename: Output filename. filename: Output filename.
""" """
with open(filename, "w") as out: with open(filename, "wb") as out:
out.write(struct.pack("<l", len(pnames))) out.write(struct.pack("<l", len(pnames)))
for pname in pnames: for pname in pnames:
out.write(struct.pack("8s", pname)) out.write(struct.pack("8s", pname.encode("ascii")))
def usage(): def usage():
print """ print("""
Usage: %s -output_texture1=texture1.lmp -output_pnames=pnames.lmp < config.txt Usage: %s -output_texture1=texture1.lmp -output_pnames=pnames.lmp < config.txt
Full list of arguments: Full list of arguments:
@ -294,7 +295,7 @@ Full list of arguments:
-compat_texture1: File containing compatibility list of TEXTURE1 textures -compat_texture1: File containing compatibility list of TEXTURE1 textures
-compat_texture2: File containing compatibility list of TEXTURE2 textures -compat_texture2: File containing compatibility list of TEXTURE2 textures
-compat_pnames: File containing compatibility list of PNAMES -compat_pnames: File containing compatibility list of PNAMES
""" """)
sys.exit(1) sys.exit(1)
def parse_command_line(args): def parse_command_line(args):