On branch swig-py3: A follow-up to  Keep simple code in conditional
block
* subversion/bindings/swig/python/tests/utils.py (file_uri_for_path):
Factor out call of pathname2url() into out of conditional block.
Patched by: brane
@@ -80,9 +80,8 @@ class Temper(object):
def file_uri_for_path(path):
"""Return the file: URI corresponding to the given path."""
if isinstance(path, str):
+ path = path.decode('UTF-8')
uri_path = pathname2url(path).encode('UTF-8')
- else:
- uri_path = pathname2url(path.decode('UTF-8')).encode('UTF-8')
# pathname2url claims to return the path part of the URI, but on Windows
# it returns both the authority and path parts for no reason, which
