in python 3, dict.has_key() has been removed

Ased in operator instead.
Also, added check for empty string.

Signed-off-by: Christian Eiden <christian@eiden.ch>

diff --git a/support/tvhmeta b/support/tvhmeta
index 31b3f1aa438062c8117a6d787344359cc29c5bac..89e22e58063e4b529cec2163bd0fc9eb2537c027 100755 (executable)
--- a/support/tvhmeta
+++ b/support/tvhmeta
@@ -233,7 +233,7 @@ class TvhMeta(object):
     if title_tuple is None:
         raise RuntimeError("Record has no title: " + data)
 
-    if not force_refresh and rec.has_key("image") and rec.has_key("fanart_image") and rec["image"] is not None and rec["fanart_image"] is not None:
+    if not force_refresh and "image" in rec and "fanart_image" in rec and rec["image"] is not None and rec["image"] != "" and rec["fanart_image"] is not None and rec["fanart_image"] != "":
         logging.info("We have both image and fanart_image already for %s so nothing to do (%s)", uuid, recjson)
         return