cleanup pylint errors and py2/3 issues

ox/web/apple.py

@@ -2,6 +2,7 @@ from __future__ import print_function
 import json
 import re
 
+from six import text_type
 from ox.cache import read_url
 
 HEADERS = {
@@ -16,9 +17,9 @@ USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7) '
 USER_AGENT += 'AppleWebKit/534.48.3 (KHTML, like Gecko) Version/5.1 Safari/534.48.3'
 
 def get_movie_data(title, director):
-    if isinstance(title, unicode):
+    if isinstance(title, text_type):
         title = title.encode('utf-8')
-    if isinstance(director, unicode):
+    if isinstance(director, text_type):
         director = director.encode('utf-8')
     data = {}
     # itunes section (preferred source for link)
@@ -45,7 +46,7 @@ def get_movie_data(title, director):
     results = js['results']
     if results:
         url = host + results[0]['location']
-        if not 'link' in data:
+        if 'link' not in data:
             data['link'] = url
         headers = {
             'User-Agent': USER_AGENT