X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=bindings%2Fpython%2Fnotmuch%2Ffilename.py;h=322e6bf135b19ed8bc5f0b852e1a5d6b3fda5535;hb=be851ad39de11f38e1cd4f7f15f1fa952232efe2;hp=f7313ec5ae856ccb008fe5ce16461e67e875faed;hpb=221c7e0b38177f5f1dbf0561580c15e8aaa49004;p=notmuch

diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py
index f7313ec5..322e6bf1 100644
--- a/bindings/python/notmuch/filename.py
+++ b/bindings/python/notmuch/filename.py
@@ -18,10 +18,10 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 """
 from ctypes import c_char_p
 from notmuch.globals import (nmlib, STATUS, NotmuchError,
-    NotmuchFilenamesP, NotmuchMessageP)
+    NotmuchFilenamesP, NotmuchMessageP, Python3StringMixIn)
 
 
-class Filenames(object):
+class Filenames(Python3StringMixIn):
     """Represents a list of filenames as returned by notmuch
 
     This object contains the Filenames iterator. The main function is
@@ -89,18 +89,15 @@ class Filenames(object):
 
         This is the main function that will usually be used by the
         user."""
-        if self._files is None:
+        if not self._files:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         while self._valid(self._files):
-            yield Filenames._get(self._files)
+            yield Filenames._get(self._files).decode('utf-8', 'ignore')
             self._move_to_next(self._files)
 
         self._files = None
 
-    def __str__(self):
-        return unicode(self).encode('utf-8')
-
     def __unicode__(self):
         """Represent Filenames() as newline-separated list of full paths