python: improve Query.count_messages docstring

[notmuch] / bindings / python / notmuch / filename.py

diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py
index 969931a4e253f5d4f22a92e387c87f43176f23b5..469b6a5a97640a463d9d8625ff21078271107181 100644 (file)
--- a/bindings/python/notmuch/filename.py
+++ b/bindings/python/notmuch/filename.py
@@ -18,7 +18,7 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 """
 from ctypes import c_char_p
 from notmuch.globals import (nmlib, STATUS, NotmuchError,
 """
 from ctypes import c_char_p
 from notmuch.globals import (nmlib, STATUS, NotmuchError,

-    NotmuchFilenamesP, NotmuchMessageP, _str, Python3StringMixIn)
+    NotmuchFilenamesP, NotmuchMessageP, Python3StringMixIn)

 
 
 class Filenames(Python3StringMixIn):
 
 
 class Filenames(Python3StringMixIn):


@@ -69,7 +69,7 @@ class Filenames(Python3StringMixIn):
              reference to it, so we can automatically delete the db object
              once all derived objects are dead.
         """
              reference to it, so we can automatically delete the db object
              once all derived objects are dead.
         """

-        if files_p is None:
+        if not files_p:

             raise NotmuchError(STATUS.NULL_POINTER)
 
         self._files = files_p
             raise NotmuchError(STATUS.NULL_POINTER)
 
         self._files = files_p


@@ -93,7 +93,7 @@ class Filenames(Python3StringMixIn):
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         while self._valid(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
             self._move_to_next(self._files)
 
         self._files = None