From 02bd5663623d6ea7b91d88e4747ad2da18ff711f Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@gmail.com>
Date: Tue, 28 Oct 2014 03:55:43 +0000
Subject: [PATCH] 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.
---
 graphics/text/smtextgen       |  6 +++---
 lumps/textures/build-textures | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/graphics/text/smtextgen b/graphics/text/smtextgen
index d15f3a04..9f3fbf42 100755
--- a/graphics/text/smtextgen
+++ b/graphics/text/smtextgen
@@ -140,9 +140,9 @@ def parse_command_line(args):
 args = parse_command_line(sys.argv[1:])
 
 if not args:
-	print "Usage: smtextgen <filename> <size> [...text commands...]"
-	print "Where each text command looks like:"
-	print "  [x,y] [text]"
+	print("Usage: smtextgen <filename> <size> [...text commands...]")
+	print("Where each text command looks like:")
+	print("  [x,y] [text]")
 	sys.exit(0)
 
 smallfont = Font()
diff --git a/lumps/textures/build-textures b/lumps/textures/build-textures
index 46f6176b..a48d987c 100755
--- a/lumps/textures/build-textures
+++ b/lumps/textures/build-textures
@@ -139,7 +139,7 @@ class TextureSet(collections.OrderedDict):
 		  filename: Path to file in which to store the resulting
 		      lump.
 		"""
-		with open(filename, "w") as out:
+		with open(filename, "wb") as out:
 			# Header indicating number of textures:
 			out.write(struct.pack("<l", len(self)))
 
@@ -152,7 +152,8 @@ class TextureSet(collections.OrderedDict):
 			# Write actual texture data:
 			for name, texture in self.items():
 				maptexture = struct.pack("<8slhhlh",
-				    name, 0, texture.w, texture.h,
+				    name.encode("ascii"), 0,
+				    texture.w, texture.h,
 				    0, len(texture.patches))
 				out.write(maptexture)
 
@@ -277,13 +278,13 @@ def write_pnames_lump(pnames, filename):
 	  pnames: List of strings containing patch names.
 	  filename: Output filename.
 	"""
-	with open(filename, "w") as out:
+	with open(filename, "wb") as out:
 		out.write(struct.pack("<l", len(pnames)))
 		for pname in pnames:
-			out.write(struct.pack("8s", pname))
+			out.write(struct.pack("8s", pname.encode("ascii")))
 
 def usage():
-	print """
+	print("""
 Usage: %s -output_texture1=texture1.lmp -output_pnames=pnames.lmp < config.txt
 
 Full list of arguments:
@@ -294,7 +295,7 @@ Full list of arguments:
   -compat_texture1: File containing compatibility list of TEXTURE1 textures
   -compat_texture2: File containing compatibility list of TEXTURE2 textures
   -compat_pnames: File containing compatibility list of PNAMES
-"""
+""")
 	sys.exit(1)
 
 def parse_command_line(args):