X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Futil%2Fencodingutil.py;h=de40482be58c255246db7c6f1f9c7453313ef1f7;hb=7ab8d49b1014186ddb8c69f2b7f90adf1ce90524;hp=efd1e218c1306076f5becc4afd0ada1f630a3731;hpb=2f37bd91b55d57fd39f5fb1f90b400c17782c618;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/src/allmydata/util/encodingutil.py b/src/allmydata/util/encodingutil.py
index efd1e218..de40482b 100644
--- a/src/allmydata/util/encodingutil.py
+++ b/src/allmydata/util/encodingutil.py
@@ -297,12 +297,7 @@ def unicode_segments_from(base_fp, ancestor_fp):
     precondition(isinstance(base_fp, FilePath), base_fp=base_fp)
     precondition(isinstance(ancestor_fp, FilePath), ancestor_fp=ancestor_fp)
 
-    if hasattr(FilePath, 'asTextMode'):
-        return base_fp.asTextMode().segmentsFrom(ancestor_fp.asTextMode())
-    else:
-        bpt, apt = (type(base_fp.path), type(ancestor_fp.path))
-        _assert(bpt == apt, bpt=bpt, apt=apt)
-        return map(_decode, base_fp.segmentsFrom(ancestor_fp))
+    return base_fp.asTextMode().segmentsFrom(ancestor_fp.asTextMode())
 
 def unicode_platform():
     """