python: fix error handling

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

diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py
index 0c2e0d52b9d14f976a806dd3cd2ee63f71b98094..3f541046ff495bc65cb6f28f50eb5fff2e64b0b3 100644 (file)
--- a/bindings/python/notmuch/filename.py
+++ b/bindings/python/notmuch/filename.py
@@ -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).decode('utf-8', errors='ignore')
+            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