diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2016-03-08 00:29:24 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2016-03-08 00:29:24 +0000 |
| commit | 3c452c90f1b8601130b8ab6c5a018c2aad0ce187 (patch) | |
| tree | 4bf6a896539e386e63ba3301f8078f73ed573e19 /devel/ice/files/patch-python-test-Ice-properties-run.py | |
| parent | net-p2p/transmission-*: update to 2.92 (diff) | |
Fix packaging with python 3.5.
This utilizes the new py3kplist feature.
While being there, fix unit tests so they work with python3 regardless
of the build environment's locale.
PR: 207771
Submitted by: rm
Approved by: maintainers (implicit)
Notes
Notes:
svn path=/head/; revision=410590
Diffstat (limited to '')
| -rw-r--r-- | devel/ice/files/patch-python-test-Ice-properties-run.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/devel/ice/files/patch-python-test-Ice-properties-run.py b/devel/ice/files/patch-python-test-Ice-properties-run.py index da98dc879c6f..0bce6ffe5340 100644 --- a/devel/ice/files/patch-python-test-Ice-properties-run.py +++ b/devel/ice/files/patch-python-test-Ice-properties-run.py @@ -1,6 +1,6 @@ --- python/test/Ice/properties/run.py.orig 2015-12-27 02:42:11.742927971 +0100 +++ python/test/Ice/properties/run.py 2015-12-27 03:06:41.640921970 +0100 -@@ -26,7 +26,7 @@ +@@ -26,10 +26,10 @@ # if sys.version_info[0] == 2: configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config" @@ -8,4 +8,8 @@ + decodedPath = configPath else: configPath = "./config/\u4e2d\u56fd_client.config" - decodedPath = configPath # No need to decode with Python3, strings are already Unicode +- decodedPath = configPath # No need to decode with Python3, strings are already Unicode ++ decodedPath = configPath.encode("utf-8", 'ignore') # No need to decode with Python3, strings are already Unicode + + TestUtil.createConfig(decodedPath, + ["# Automatically generated by Ice test driver.", |