summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-08-17 18:14:01 +0200
committerJose <jose@zeroc.com>2015-08-17 18:14:01 +0200
commitafaccb7fa3f903ca1adef729bb7f898e68afcd96 (patch)
tree8ee72e51c305666c8b893e79046628804c1116bb /python
parentAdded missing semicolon (diff)
downloadice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.tar.bz2
ice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.tar.xz
ice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.zip
Fix for Ice/properties when running with python 2.7
Diffstat (limited to 'python')
-rwxr-xr-xpython/test/Ice/properties/run.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/python/test/Ice/properties/run.py b/python/test/Ice/properties/run.py
index c6ce2b8cfad..23719647b00 100755
--- a/python/test/Ice/properties/run.py
+++ b/python/test/Ice/properties/run.py
@@ -29,7 +29,7 @@ if sys.version_info[0] == 2:
else:
configPath = "./config/\u4e2d\u56fd_client.config"
-TestUtil.createConfig(configPath,
+TestUtil.createConfig(configPath.decode("utf-8"),
["# Automatically generated by Ice test driver.",
"Ice.Trace.Protocol=1",
"Ice.Trace.Network=1",
@@ -39,5 +39,5 @@ TestUtil.createConfig(configPath,
TestUtil.simpleTest()
-if os.path.exists(configPath):
- os.remove(configPath)
+if os.path.exists(configPath.decode("utf-8")):
+ os.remove(configPath.decode("utf-8"))