summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-12-21 11:46:24 -0800
committerKenneth Graunke <kenneth@whitecape.org>2012-02-17 01:28:46 -0800
commit652e842de96922078bd80ecf4532a74c831233a6 (patch)
treeae48054d2bdbe5d3bdb1926ac1828173ced6db5e /framework
parent19f34bf1338cfc4a93d777564aedb0bf805140d5 (diff)
Make ExecTest's test name splitting more Unicode-proof.
If by some bizarre circumstance, self.command were to be unicode, this would fail because type(self.command) wouldn't be types.StringType. Also, I don't think shlex.split handles unicode, so just convert it. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/exectest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/exectest.py b/framework/exectest.py
index 04b0d3e4..d4a2bd85 100644
--- a/framework/exectest.py
+++ b/framework/exectest.py
@@ -37,8 +37,8 @@ class ExecTest(Test):
self.command = command
self.env = {}
- if type(self.command) is types.StringType:
- self.command = shlex.split(self.command)
+ if isinstance(self.command, basestring):
+ self.command = shlex.split(str(self.command))
def interpretResult(self, out, results):
raise NotImplementedError