Merge branch 'master' into playback-info

jimporter · Nov 28, 2014 · 011e9b7 · 011e9b7
2 parents e786741 + 9ba6971
commit 011e9b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/plugin.video.giantbomb/default.py b/plugin.video.giantbomb/default.py
@@ -290,14 +290,14 @@ def search(query=None, page='0'):
 
     page = int(page)
 
-    if query is None:
+    if not query:
         keyboard = xbmc.Keyboard('', 'Search', False)
         keyboard.doModal()
         if keyboard.isConfirmed():
             query = keyboard.getText()
-        else:
-            xbmc.executebuiltin('Action(ParentDir)')
-            return
+    if not query:
+        xbmc.executebuiltin('Action(ParentDir)')
+        return
 
     data = gb.query('search', { 'resources': 'video', 'query': query,
                                  'offset': page*100 })

diff --git a/test/test_giantbomb.py b/test/test_giantbomb.py
@@ -26,8 +26,8 @@ def test_videos(self):
         self.assertEquals(data['number_of_page_results'], len(data['results']))
 
         for video in data['results']:
-            self.assertIsInstance(video['name'], str)
-            self.assertIsInstance(video['deck'], str)
+            self.assertIsInstance(video['name'], basestring)
+            self.assertIsInstance(video['deck'], basestring)
             self.assertIsInstance(video['length_seconds'], int)
 
             self.assertIsInstance(video['publish_date'], str)