Sun Aug 14 23:59:59 BST 2011 david-sarah@jacaranda.org

  * interfaces.py: ensure that NoSuchChildError can be converted to str even when it is for a non-ASCII name. fixes #1483

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index 29ccd27a07d571f755e3bd8127567d99b8e81e36..749be28168cd5bd61c3cafcaf275365fed369627 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -1103,6 +1103,9 @@ class ExistingChildError(Exception):
 
 class NoSuchChildError(Exception):
     """A directory node was asked to fetch a child which does not exist."""
+    def __str__(self):
+        # avoid UnicodeEncodeErrors when converting to str
+        return self.__repr__()
 
 class ChildOfWrongTypeError(Exception):
     """An operation was attempted on a child of the wrong type (file or directory)."""