diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-09-17 13:39:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-17 13:39:38 +0200 |
| commit | 379afcdff62c3084a776ed172af6d2d66972a23e (patch) | |
| tree | 7b13fdb1ffcb41358d9a172a4a79cbae279620c3 /java/test/Ice/properties/run.py | |
| parent | Fixes for Amazon Linux and better error diagnostics (diff) | |
| download | ice-379afcdff62c3084a776ed172af6d2d66972a23e.tar.bz2 ice-379afcdff62c3084a776ed172af6d2d66972a23e.tar.xz ice-379afcdff62c3084a776ed172af6d2d66972a23e.zip | |
Fixed ICE-5433 - fixed test/Ice/properties/run.py to work with non-UTF8 locales
Diffstat (limited to 'java/test/Ice/properties/run.py')
| -rwxr-xr-x | java/test/Ice/properties/run.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/java/test/Ice/properties/run.py b/java/test/Ice/properties/run.py index 1bb3ff858e2..2c04688f961 100755 --- a/java/test/Ice/properties/run.py +++ b/java/test/Ice/properties/run.py @@ -25,22 +25,17 @@ import TestUtil # Write config # if sys.version_info[0] == 2: - configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8") - TestUtil.createConfig(configPath, - ["# Automatically generated by Ice test driver.", - "Ice.Trace.Protocol=1", - "Ice.Trace.Network=1", - "Ice.ProgramName=PropertiesClient", - "Config.Path=./config/中国_client.config"]) + configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config" else: configPath = "./config/\u4e2d\u56fd_client.config" - TestUtil.createConfig(configPath, - ["# Automatically generated by Ice test driver.", - "Ice.Trace.Protocol=1", - "Ice.Trace.Network=1", - "Ice.ProgramName=PropertiesClient", - "Config.Path=" + configPath], - "utf-8") + +TestUtil.createConfig(configPath, + ["# Automatically generated by Ice test driver.", + "Ice.Trace.Protocol=1", + "Ice.Trace.Network=1", + "Ice.ProgramName=PropertiesClient", + "Config.Path=" + configPath], + "utf-8") sys.stdout.write("starting client... ") sys.stdout.flush() |