Merge branch 'master' of github.com:wagnerrp/pytmdb3

wagnerrp · Nov 16, 2014 · 5b917e9 · 5b917e9
2 parents d9fdc2e + 58ca5f2
commit 5b917e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tmdb3/pager.py b/tmdb3/pager.py
@@ -22,7 +22,10 @@ def next(self):
         self._index += 1
         if self._index == self._len:
             raise StopIteration
-        return self._parent[self._index]
+        try:
+            return self._parent[self._index]
+        except IndexError:
+            raise StopIteration
 
 
 class UnpagedData(object):

diff --git a/tmdb3/util.py b/tmdb3/util.py
@@ -83,8 +83,7 @@ def apply(self, data, set_nones=True):
         # apply data directly, bypassing callable function
         unfilled = False
         for k, v in self.lookup.items():
-            if (k in data) and \
-                    ((data[k] is not None) if callable(self.func) else True):
+            if (k in data) and (not callable(self.func) or data[k] is not None):
                 # argument received data, populate it
                 setattr(self.inst, v, data[k])
             elif v in self.inst._data: