diff options
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 122 | 
1 files changed, 61 insertions, 61 deletions
| diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index f0d3e0c63..f07735360 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -252,7 +252,7 @@ class YoutubeIE(InfoExtractor):  					password = info[2]  				else:  					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE) -			except (IOError, netrc.NetrcParseError), err: +			except (IOError, netrc.NetrcParseError) as err:  				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % compat_str(err))  				return @@ -261,7 +261,7 @@ class YoutubeIE(InfoExtractor):  		try:  			self.report_lang()  			urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % compat_str(err))  			return @@ -284,7 +284,7 @@ class YoutubeIE(InfoExtractor):  			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:  				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')  				return -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % compat_str(err))  			return @@ -297,7 +297,7 @@ class YoutubeIE(InfoExtractor):  		try:  			self.report_age_confirmation()  			age_results = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % compat_str(err))  			return @@ -319,7 +319,7 @@ class YoutubeIE(InfoExtractor):  		request = urllib2.Request('http://www.youtube.com/watch?v=%s&gl=US&hl=en&has_verified=1' % video_id)  		try:  			video_webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -341,7 +341,7 @@ class YoutubeIE(InfoExtractor):  				video_info = parse_qs(video_info_webpage)  				if 'token' in video_info:  					break -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % compat_str(err))  				return  		if 'token' not in video_info: @@ -404,7 +404,7 @@ class YoutubeIE(InfoExtractor):  				request = urllib2.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id)  				try:  					srt_list = urllib2.urlopen(request).read() -				except (urllib2.URLError, httplib.HTTPException, socket.error), err: +				except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  					raise Trouble(u'WARNING: unable to download video subtitles: %s' % compat_str(err))  				srt_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', srt_list)  				srt_lang_list = dict((l[1], l[0]) for l in srt_lang_list) @@ -421,7 +421,7 @@ class YoutubeIE(InfoExtractor):  				request = urllib2.Request('http://www.youtube.com/api/timedtext?lang=%s&name=%s&v=%s' % (srt_lang, srt_lang_list[srt_lang], video_id))  				try:  					srt_xml = urllib2.urlopen(request).read() -				except (urllib2.URLError, httplib.HTTPException, socket.error), err: +				except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  					raise Trouble(u'WARNING: unable to download video subtitles: %s' % compat_str(err))  				if not srt_xml:  					raise Trouble(u'WARNING: unable to download video subtitles') @@ -543,7 +543,7 @@ class MetacafeIE(InfoExtractor):  		try:  			self.report_disclaimer()  			disclaimer = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % compat_str(err))  			return @@ -556,7 +556,7 @@ class MetacafeIE(InfoExtractor):  		try:  			self.report_age_confirmation()  			disclaimer = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % compat_str(err))  			return @@ -580,7 +580,7 @@ class MetacafeIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % compat_str(err))  			return @@ -671,7 +671,7 @@ class DailymotionIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % compat_str(err))  			return @@ -767,7 +767,7 @@ class GoogleIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -806,7 +806,7 @@ class GoogleIE(InfoExtractor):  			request = urllib2.Request('http://video.google.com/videosearch?q=%s+site:video.google.com&hl=en' % abs(int(video_id)))  			try:  				webpage = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  				return  			mobj = re.search(r'<img class=thumbnail-img (?:.* )?src=(http.*)>', webpage) @@ -860,7 +860,7 @@ class PhotobucketIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -928,7 +928,7 @@ class YahooIE(InfoExtractor):  			request = urllib2.Request(url)  			try:  				webpage = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  				return @@ -952,7 +952,7 @@ class YahooIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -1010,7 +1010,7 @@ class YahooIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -1066,7 +1066,7 @@ class VimeoIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -1172,10 +1172,10 @@ class ArteTvIE(InfoExtractor):  		try:  			self.report_download_webpage(url)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return -		except ValueError, err: +		except ValueError as err:  			self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)  			return  		return webpage @@ -1368,10 +1368,10 @@ class GenericIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return -		except ValueError, err: +		except ValueError as err:  			# since this is the last-resort InfoExtractor, if  			# this error is thrown, it'll be thrown here  			self._downloader.trouble(u'ERROR: Invalid URL: %s' % url) @@ -1487,7 +1487,7 @@ class YoutubeSearchIE(InfoExtractor):  			request = urllib2.Request(result_url)  			try:  				data = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download API page: %s' % compat_str(err))  				return  			api_response = json.loads(data)['data'] @@ -1564,7 +1564,7 @@ class GoogleSearchIE(InfoExtractor):  			request = urllib2.Request(result_url)  			try:  				page = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -1647,7 +1647,7 @@ class YahooSearchIE(InfoExtractor):  			request = urllib2.Request(result_url)  			try:  				page = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -1717,7 +1717,7 @@ class YoutubePlaylistIE(InfoExtractor):  			request = urllib2.Request(url)  			try:  				page = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -1774,7 +1774,7 @@ class YoutubeChannelIE(InfoExtractor):  			request = urllib2.Request(url)  			try:  				page = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -1837,7 +1837,7 @@ class YoutubeUserIE(InfoExtractor):  			try:  				page = urllib2.urlopen(request).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -1909,7 +1909,7 @@ class BlipTVUserIE(InfoExtractor):  			page = urllib2.urlopen(request).read().decode('utf-8')  			mobj = re.search(r'data-users-id="([^"]+)"', page)  			page_base = page_base % mobj.group(1) -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  			return @@ -1929,7 +1929,7 @@ class BlipTVUserIE(InfoExtractor):  			try:  				page = urllib2.urlopen(request).read().decode('utf-8') -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))  				return @@ -1997,7 +1997,7 @@ class DepositFilesIE(InfoExtractor):  		try:  			self.report_download_webpage(file_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve file webpage: %s' % compat_str(err))  			return @@ -2113,7 +2113,7 @@ class FacebookIE(InfoExtractor):  					password = info[2]  				else:  					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE) -			except (IOError, netrc.NetrcParseError), err: +			except (IOError, netrc.NetrcParseError) as err:  				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % compat_str(err))  				return @@ -2133,7 +2133,7 @@ class FacebookIE(InfoExtractor):  			if re.search(r'<form(.*)name="login"(.*)</form>', login_results) is not None:  				self._downloader.to_stderr(u'WARNING: unable to log in: bad username/password, or exceded login rate limit (~3/min). Check credentials or wait.')  				return -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % compat_str(err))  			return @@ -2150,7 +2150,7 @@ class FacebookIE(InfoExtractor):  		try:  			page = urllib2.urlopen(request)  			video_webpage = page.read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -2285,13 +2285,13 @@ class BlipTVIE(InfoExtractor):  					'ext': ext,  					'urlhandle': urlh  				} -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % compat_str(err))  			return  		if info is None: # Regular URL  			try:  				json_code = urlh.read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % compat_str(err))  				return @@ -2321,7 +2321,7 @@ class BlipTVIE(InfoExtractor):  					'description': data['description'],  					'player_url': data['embedUrl']  				} -			except (ValueError,KeyError), err: +			except (ValueError,KeyError) as err:  				self._downloader.trouble(u'ERROR: unable to parse video information: %s' % repr(err))  				return @@ -2359,7 +2359,7 @@ class MyVideoIE(InfoExtractor):  		try:  			self.report_download_webpage(video_id)  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return @@ -2456,7 +2456,7 @@ class ComedyCentralIE(InfoExtractor):  		try:  			htmlHandle = urllib2.urlopen(req)  			html = htmlHandle.read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  			return  		if dlNewest: @@ -2489,7 +2489,7 @@ class ComedyCentralIE(InfoExtractor):  		try:  			urlHandle = urllib2.urlopen(playerUrl_raw)  			playerUrl = urlHandle.geturl() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to find out player URL: ' + compat_str(err))  			return @@ -2498,7 +2498,7 @@ class ComedyCentralIE(InfoExtractor):  		self.report_index_download(epTitle)  		try:  			indexXml = urllib2.urlopen(indexUrl).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download episode index: ' + compat_str(err))  			return @@ -2519,7 +2519,7 @@ class ComedyCentralIE(InfoExtractor):  			self.report_config_download(epTitle)  			try:  				configXml = urllib2.urlopen(configReq).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))  				return @@ -2602,7 +2602,7 @@ class EscapistIE(InfoExtractor):  			webPageBytes = webPage.read()  			m = re.match(r'text/html; charset="?([^"]+)"?', webPage.headers['Content-Type'])  			webPage = webPageBytes.decode(m.group(1) if m else 'utf-8') -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download webpage: ' + compat_str(err))  			return @@ -2618,7 +2618,7 @@ class EscapistIE(InfoExtractor):  		self.report_config_download(showName)  		try:  			configJSON = urllib2.urlopen(configUrl).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download configuration: ' + compat_str(err))  			return @@ -2627,7 +2627,7 @@ class EscapistIE(InfoExtractor):  		try:  			config = json.loads(configJSON) -		except (ValueError,), err: +		except (ValueError,) as err:  			self._downloader.trouble(u'ERROR: Invalid JSON in configuration file: ' + compat_str(err))  			return @@ -2674,7 +2674,7 @@ class CollegeHumorIE(InfoExtractor):  		request = urllib2.Request(url)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -2695,7 +2695,7 @@ class CollegeHumorIE(InfoExtractor):  		xmlUrl = 'http://www.collegehumor.com/moogaloop/video:' + internal_video_id  		try:  			metaXml = urllib2.urlopen(xmlUrl).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % compat_str(err))  			return @@ -2740,7 +2740,7 @@ class XVideosIE(InfoExtractor):  		request = urllib2.Request(r'http://www.xvideos.com/video' + video_id)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -2824,7 +2824,7 @@ class SoundcloudIE(InfoExtractor):  		request = urllib2.Request('http://soundcloud.com/%s/%s' % (uploader, slug_title))  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -2901,7 +2901,7 @@ class InfoQIE(InfoExtractor):  		request = urllib2.Request(url)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -2980,7 +2980,7 @@ class MixcloudIE(InfoExtractor):  			try:  				urllib2.urlopen(url)  				return url -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				url = None  		return None @@ -3013,7 +3013,7 @@ class MixcloudIE(InfoExtractor):  		try:  			self.report_download_json(file_url)  			jsonData = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve file: %s' % compat_str(err))  			return @@ -3092,7 +3092,7 @@ class StanfordOpenClassroomIE(InfoExtractor):  			xmlUrl = baseUrl + video + '.xml'  			try:  				metaXml = urllib2.urlopen(xmlUrl).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download video info XML: %s' % compat_str(err))  				return  			mdoc = xml.etree.ElementTree.fromstring(metaXml) @@ -3116,7 +3116,7 @@ class StanfordOpenClassroomIE(InfoExtractor):  			self.report_download_webpage(info['id'])  			try:  				coursepage = urllib2.urlopen(url).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download course info page: ' + compat_str(err))  				return @@ -3155,7 +3155,7 @@ class StanfordOpenClassroomIE(InfoExtractor):  			rootURL = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'  			try:  				rootpage = urllib2.urlopen(rootURL).read() -			except (urllib2.URLError, httplib.HTTPException, socket.error), err: +			except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  				self._downloader.trouble(u'ERROR: unable to download course info page: ' + compat_str(err))  				return @@ -3202,7 +3202,7 @@ class MTVIE(InfoExtractor):  		request = urllib2.Request(url)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % compat_str(err))  			return @@ -3235,7 +3235,7 @@ class MTVIE(InfoExtractor):  		request = urllib2.Request(videogen_url)  		try:  			metadataXml = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video metadata: %s' % compat_str(err))  			return @@ -3417,7 +3417,7 @@ class XNXXIE(InfoExtractor):  		# Get webpage content  		try:  			webpage = urllib2.urlopen(url).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % err)  			return @@ -3497,7 +3497,7 @@ class GooglePlusIE(InfoExtractor):  		request = urllib2.Request(post_url)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve entry webpage: %s' % compat_str(err))  			return @@ -3539,7 +3539,7 @@ class GooglePlusIE(InfoExtractor):  		request = urllib2.Request(video_page)  		try:  			webpage = urllib2.urlopen(request).read() -		except (urllib2.URLError, httplib.HTTPException, socket.error), err: +		except (urllib2.URLError, httplib.HTTPException, socket.error) as err:  			self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % compat_str(err))  			return  		self.report_extract_vid_page(video_page) | 
