From: Sergey M․ Date: Fri, 2 May 2014 19:30:50 +0000 (+0700) Subject: [newstube] Do not shadow standard str X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;ds=inline;h=3b1dfc0f2f49117c30fab8aef45993ecf99256c2;hp=d664de44b70e45a6a1764c372c49839ea4769ba2;p=youtube-dl [newstube] Do not shadow standard str --- diff --git a/youtube_dl/extractor/newstube.py b/youtube_dl/extractor/newstube.py index 119414da0..2fd5b8f04 100644 --- a/youtube_dl/extractor/newstube.py +++ b/youtube_dl/extractor/newstube.py @@ -37,8 +37,8 @@ class NewstubeIE(InfoExtractor): 'http://p.newstube.ru/v2/player.asmx/GetAutoPlayInfo6?state=&url=%s&sessionId=&id=%s&placement=profile&location=n2' % (url, video_guid), video_guid, 'Downloading player XML') - def ns(str): - return str.replace('/', '/%(ns)s') % {'ns': '{http://app1.newstube.ru/N2SiteWS/player.asmx}'} + def ns(s): + return s.replace('/', '/%(ns)s') % {'ns': '{http://app1.newstube.ru/N2SiteWS/player.asmx}'} session_id = player.find(ns('./SessionId')).text media_info = player.find(ns('./Medias/MediaInfo'))