From e38b97b26faee2d1bc8932e3fdf97f232989792b Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 9 Mar 2014 00:57:09 +0000
Subject: [PATCH] fix for Python versions before 2.6

---
 makepanda/makepanda.py | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 27fc4d4dd4..b9bf4ee274 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -1641,7 +1641,11 @@ def RunGenPyCode(target, inputs, opts):
     if (PkgSkip("PYTHON") != 0):
         return
 
-    cmdstr = sys.executable + " -B " + os.path.join(GetOutputDir(), "direct", "ffi", "jGenPyCode.py")
+    cmdstr = sys.executable + " "
+    if sys.version_info >= (2, 6):
+        cmdstr += "-B "
+
+    cmdstr += os.path.join(GetOutputDir(), "direct", "ffi", "jGenPyCode.py")
     if (GENMAN): cmdstr += " -d"
     cmdstr += " -r"
     for i in inputs:
@@ -1661,7 +1665,11 @@ def RunGenPyCode(target, inputs, opts):
 def FreezePy(target, inputs, opts):
     assert len(inputs) > 0
     # Make sure this function isn't called before genpycode is run.
-    cmdstr = sys.executable + " -B " + os.path.join("direct", "src", "showutil", "pfreeze.py")
+    cmdstr = sys.executable + " "
+    if sys.version_info >= (2, 6):
+        cmdstr += "-B "
+
+    cmdstr += os.path.join("direct", "src", "showutil", "pfreeze.py")
     src = inputs.pop(0)
     for i in inputs:
       cmdstr += " -i " + os.path.splitext(i)[0]
@@ -1685,10 +1693,14 @@ def FreezePy(target, inputs, opts):
 def Package(target, inputs, opts):
     assert len(inputs) == 1
     # Invoke the ppackage script.
-    command = sys.executable
-    if (GetOptimizeOption(opts) >= 4):
-        command += " -OO"
-    command += " -B direct/src/p3d/ppackage.py"
+    command = sys.executable + " "
+    if GetOptimizeOption(opts) >= 4:
+        command += "-OO "
+
+    if sys.version_info >= (2, 6):
+        command += "-B "
+
+    command += "direct/src/p3d/ppackage.py"
 
     if GetTarget() == "darwin":
         if SDK.get("MACOSX") is not None:
@@ -6321,7 +6333,12 @@ def MakeInstallerOSX():
     if (RUNTIME):
         # Invoke the make_installer script.
         AddToPathEnv("DYLD_LIBRARY_PATH", GetOutputDir() + "/plugins")
-        oscmd(sys.executable + " -B direct/src/plugin_installer/make_installer.py --version %s" % VERSION)
+        cmdstr = sys.executable + " "
+        if sys.version_info >= (2, 6):
+            cmdstr += "-B "
+
+        cmdstr += "direct/src/plugin_installer/make_installer.py --version %s" % VERSION
+        oscmd(cmdstr)
         return
 
     import compileall