Try to get 2.6 + 3.x compatibility with shlex.shlex

tony · tony · commit a0a5a895afe9 · 2015-03-24T17:32:06.000-07:00
diff --git a/tmuxp/util.py b/tmuxp/util.py
@@ -32,7 +32,7 @@ def run_before_script(script_file):
     """Function to wrap try/except for subprocess.check_call()."""
     try:
         proc = subprocess.Popen(
-            shlex.split(script_file.encode('ascii')),
+            shlex.split(str(script_file)),
             stderr=subprocess.PIPE
         )
         proc.wait()

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ def run_before_script(script_file):`
`32`	`32`	`"""Function to wrap try/except for subprocess.check_call()."""`
`33`	`33`	`try:`
`34`	`34`	`proc = subprocess.Popen(`
`35`		`- shlex.split(script_file.encode('ascii')),`
	`35`	`+ shlex.split(str(script_file)),`
`36`	`36`	`stderr=subprocess.PIPE`
`37`	`37`	`)`
`38`	`38`	`proc.wait()`