diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-08-28 21:04:40 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-08-28 21:04:40 +0000 |
| commit | a9e5f177d02631c0922c9ee824459a8951bc6403 (patch) | |
| tree | 249c06ac89b492663f87f5d5d298514997a28c15 /java | |
| parent | Fix isDebian method typo (diff) | |
| download | ice-a9e5f177d02631c0922c9ee824459a8951bc6403.tar.bz2 ice-a9e5f177d02631c0922c9ee824459a8951bc6403.tar.xz ice-a9e5f177d02631c0922c9ee824459a8951bc6403.zip | |
ICE-6742 - more python3 fixes
Diffstat (limited to 'java')
| -rwxr-xr-x | java/test/src/main/java/test/Ice/properties/run.py | 8 |
1 files changed, 5 insertions, 3 deletions
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 4656eeae3e7..ef59960e97c 100755 --- a/java/test/src/main/java/test/Ice/properties/run.py +++ b/java/test/src/main/java/test/Ice/properties/run.py @@ -27,10 +27,12 @@ import TestUtil # if sys.version_info[0] == 2: configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config" + decodedPath = configPath.decode("utf-8") else: configPath = "./config/\u4e2d\u56fd_client.config" + decodedPath = configPath # No need to decode with Python3, strings are already Unicode -TestUtil.createConfig(configPath.decode("utf-8"), +TestUtil.createConfig(decodedPath, ["# Automatically generated by Ice test driver.", "Ice.Trace.Protocol=1", "Ice.Trace.Network=1", @@ -45,5 +47,5 @@ print("ok") clientProc.startReader() clientProc.waitTestSuccess() -if os.path.exists(configPath.decode("utf-8")): - os.remove(configPath.decode("utf-8")) +if os.path.exists(decodedPath): + os.remove(decodedPath) |