diff options
| author | Jose <jose@zeroc.com> | 2015-08-17 18:14:01 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-08-17 18:14:01 +0200 |
| commit | afaccb7fa3f903ca1adef729bb7f898e68afcd96 (patch) | |
| tree | 8ee72e51c305666c8b893e79046628804c1116bb | |
| parent | Added missing semicolon (diff) | |
| download | ice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.tar.bz2 ice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.tar.xz ice-afaccb7fa3f903ca1adef729bb7f898e68afcd96.zip | |
Fix for Ice/properties when running with python 2.7
| -rwxr-xr-x | cpp/test/Ice/properties/run.py | 6 | ||||
| -rwxr-xr-x | csharp/test/Ice/properties/run.py | 6 | ||||
| -rwxr-xr-x | java/test/src/main/java/test/Ice/properties/run.py | 6 | ||||
| -rwxr-xr-x | python/test/Ice/properties/run.py | 6 | ||||
| -rwxr-xr-x | ruby/test/Ice/properties/run.py | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/cpp/test/Ice/properties/run.py b/cpp/test/Ice/properties/run.py index 3fc30655f5b..de83d2e51e2 100755 --- a/cpp/test/Ice/properties/run.py +++ b/cpp/test/Ice/properties/run.py @@ -31,7 +31,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", @@ -41,5 +41,5 @@ TestUtil.createConfig(configPath, TestUtil.simpleTest(client) -if os.path.exists(configPath): - os.remove(configPath) +if os.path.exists(configPath.decode("utf-8")): + os.remove(configPath.decode("utf-8")) diff --git a/csharp/test/Ice/properties/run.py b/csharp/test/Ice/properties/run.py index c6ce2b8cfad..23719647b00 100755 --- a/csharp/test/Ice/properties/run.py +++ b/csharp/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")) diff --git a/java/test/src/main/java/test/Ice/properties/run.py b/java/test/src/main/java/test/Ice/properties/run.py index 6be33f5c7ef..4656eeae3e7 100755 --- a/java/test/src/main/java/test/Ice/properties/run.py +++ b/java/test/src/main/java/test/Ice/properties/run.py @@ -30,7 +30,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", @@ -45,5 +45,5 @@ print("ok") clientProc.startReader() clientProc.waitTestSuccess() -if os.path.exists(configPath): - os.remove(configPath) +if os.path.exists(configPath.decode("utf-8")): + os.remove(configPath.decode("utf-8")) 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")) diff --git a/ruby/test/Ice/properties/run.py b/ruby/test/Ice/properties/run.py index c6ce2b8cfad..23719647b00 100755 --- a/ruby/test/Ice/properties/run.py +++ b/ruby/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")) |