MyTube: small fix on error-handling

diff --git a/mytube/src/MyTubeService.py b/mytube/src/MyTubeService.py
index 7371026..4114bf0 100755 (executable)
--- a/mytube/src/MyTubeService.py
+++ b/mytube/src/MyTubeService.py
@@ -213,7 +213,7 @@ class MyTubeFeedEntry():
                try:
                        print "[MyTube] trying to find out if a HD Stream is available",watch_url
                        watchvideopage = urlopen2(watchrequest).read()
-               except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+               except (URLError, HTTPException, socket.error), err:
                        print "[MyTube] Error: Unable to retrieve watchpage - Error code: ", str(err)
                        return video_url
 
@@ -226,7 +226,7 @@ class MyTubeFeedEntry():
                                videoinfo = parse_qs(infopage)
                                if 'fmt_url_map' in videoinfo:
                                        break
-                       except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+                       except (URLError, HTTPException, socket.error), err:
                                print "[MyTube] Error: unable to download video infopage",str(err)
                                return video_url
 

diff --git a/mytube/src/plugin.py b/mytube/src/plugin.py
index 8f9c71d..d6fbe85 100755 (executable)
--- a/mytube/src/plugin.py
+++ b/mytube/src/plugin.py
@@ -28,7 +28,7 @@ from Components.Task import Task, Job, job_manager
 from threading import Thread
 from threading import Condition
 
-from Tools.Directories import pathExists, fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE, SCOPE_HDD
+from Tools.Directories import pathExists, fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE, SCOPE_HDD, SCOPE_CURRENT_PLUGIN
 from Tools.LoadPixmap import LoadPixmap
 from Tools.Downloader import HTTPProgressDownloader, downloadWithProgress
 from enigma import eTimer, quitMainloop,eListbox,ePoint, RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER, eListboxPythonMultiContent, eListbox, gFont, getDesktop, ePicLoad, eServiceCenter, iServiceInformation, eServiceReference,iSeekableService,iServiceInformation, iPlayableService, iPlayableServicePtr