python: more error handling fixes

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

diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py
index 0c2e0d52b9d14f976a806dd3cd2ee63f71b98094..322e6bf135b19ed8bc5f0b852e1a5d6b3fda5535 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,
-    NotmuchFilenamesP, NotmuchMessageP, _str, Python3StringMixIn)
+    NotmuchFilenamesP, NotmuchMessageP, 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.
         """
-        if files_p is None:
+        if not files_p:
             raise NotmuchError(STATUS.NULL_POINTER)
 
         self._files = files_p
@@ -89,11 +89,11 @@ class Filenames(Python3StringMixIn):
 
         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).decode('utf-8', errors='ignore')
+            yield Filenames._get(self._files).decode('utf-8', 'ignore')
             self._move_to_next(self._files)
 
         self._files = None