better urllib compatibility

cleaned up urllib python2-3
mdhiggins · Dec 30, 2015 · cc54bde · cc54bde
1 parent 9aad01f
commit cc54bde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/tmdb_mp4.py b/tmdb_mp4.py
@@ -1,6 +1,9 @@
 import os
 import sys
-import urllib
+try:
+    from urllib.request import urlretrieve
+except ImportError:
+    from urllib import urlretrieve
 try:
     from StringIO import StringIO
 except ImportError:
@@ -190,12 +193,9 @@ def getArtwork(self, mp4Path, filename='cover'):
         # Pulls down all the poster metadata for the correct season and sorts them into the Poster object
         if poster is None:
             try:
-                poster = urllib.urlretrieve(self.movie.get_poster("l"), os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
+                poster = urlretrieve(self.movie.get_poster("l"), os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
             except:
-                try:
-                    poster = urllib.request.urlretrieve(self.movie.get_poster("l"), os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
-                except:
-                    poster = None
+                poster = None
         return poster
 
 

diff --git a/tvdb_mp4.py b/tvdb_mp4.py
@@ -1,5 +1,9 @@
 import os
 import sys
+try:
+    from urllib.request import urlretrieve
+except ImportError:
+    from urllib import urlretrieve
 import urllib
 try:
     from StringIO import StringIO
@@ -200,12 +204,9 @@ def getArtwork(self, mp4Path, filename='cover', thumbnail=False):
         if poster is None:
             if thumbnail:
                 try:
-                    poster = urllib.urlretrieve(self.episodedata['filename'], os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
+                    poster = urlretrieve(self.episodedata['filename'], os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
                 except:
-                    try:
-                        poster = urllib.request.urlretrieve(self.episodedata['filename'], os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
-                    except:
-                        poster = None
+                    poster = None
             else:
                 posters = posterCollection()
                 try:
@@ -217,10 +218,8 @@ def getArtwork(self, mp4Path, filename='cover', thumbnail=False):
                                 poster.rating = float(self.showdata['_banners']['season']['season'][bannerid]['rating'])
                             poster.bannerpath = self.showdata['_banners']['season']['season'][bannerid]['_bannerpath']
                             posters.addPoster(poster)
-                    try:
-                        poster = urllib.urlretrieve(posters.topPoster().bannerpath, os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
-                    except:
-                        poster = urllib.request.urlretrieve(posters.topPoster().bannerpath, os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
+
+                        poster = urlretrieve(posters.topPoster().bannerpath, os.path.join(tempfile.gettempdir(), "poster.jpg"))[0]
                 except:
                     poster = None
         return poster