[Checkins] SVN: z3c.rml/trunk/ Removed windows condition, use python executable on other OS too

Roger Ineichen roger at projekt01.ch
Sat Jan 26 09:39:30 EST 2008


Log message for revision 83244:
  Removed windows condition, use python executable on other OS too
  Changed CHANGES.txt

Changed:
  U   z3c.rml/trunk/CHANGES.txt
  U   z3c.rml/trunk/src/z3c/rml/rml2pdfscript.py

-=-
Modified: z3c.rml/trunk/CHANGES.txt
===================================================================
--- z3c.rml/trunk/CHANGES.txt	2008-01-26 14:25:16 UTC (rev 83243)
+++ z3c.rml/trunk/CHANGES.txt	2008-01-26 14:39:29 UTC (rev 83244)
@@ -2,14 +2,18 @@
 CHANGES
 =======
 
+0.8.0dev (unreleased)
+---------------------
+
+- Bug: Use python executable as a part of the subprocess command.
+
+
 0.7.3 (2007-11-10)
 ------------------
 
-- Bug: Use python executable as a part of the subprocess command. This is only
-  needed on a windows system
-
 - Make sure that the output dir is included in the distribution.
 
+
 0.7.2 (2007-11-10)
 ------------------
 

Modified: z3c.rml/trunk/src/z3c/rml/rml2pdfscript.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/rml2pdfscript.py	2008-01-26 14:25:16 UTC (rev 83243)
+++ z3c.rml/trunk/src/z3c/rml/rml2pdfscript.py	2008-01-26 14:39:29 UTC (rev 83244)
@@ -22,9 +22,6 @@
 
 _fileOpen = None
 
-WIN = False
-if sys.platform[:3].lower() == "win":
-    WIN = True
 
 def excecuteSubProcess(xmlInputName, outputFileName, testing=None):
     # set the sys path given from the parent process
@@ -89,13 +86,7 @@
     py = sys.executable
 
     # setup the cmd
-    if WIN:
-        # we need an explicit python in our command
-        program = [py, __file__, 'excecuteSubProcess', xmlInputName,
-                   outputFileName]
-    else:
-        # seems that this is not the case on linux
-        program = [__file__, 'excecuteSubProcess', xmlInputName, outputFileName]
+    program = [py, __file__, 'excecuteSubProcess', xmlInputName, outputFileName]
     if testing is True:
         program.append('testing=1')
     program = " ".join(program)



More information about the Checkins mailing list