X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube-dl;h=192f9b21fa711ca99565cbb270ee60de3c1a5cc6;hb=7ab2043c9c740e12abf02d065e282f28516939c0;hp=a0cafeae9bc7b17d110e4da18468c9ed225a067e;hpb=fd209848897f45e9df8931d14e937f0b0ed2a547;p=youtube-dl.git diff --git a/youtube-dl b/youtube-dl index a0cafeae9..192f9b21f 100755 --- a/youtube-dl +++ b/youtube-dl @@ -144,7 +144,7 @@ class FileDownloader(object): return '--:--' return '%02d:%02d' % (eta_mins, eta_secs) - @staticmethod + @staticmethod def calc_speed(start, now, bytes): dif = now - start if bytes == 0 or dif < 0.001: # One millisecond @@ -493,12 +493,8 @@ class YoutubeIE(InfoExtractor): self.to_stderr(u'WARNING: parsing .netrc: %s' % str(err)) return - # No authentication to be performed - if username is None: - return - # Set language - request = urllib2.Request(self._LOGIN_URL, None, std_headers) + request = urllib2.Request(self._LANG_URL, None, std_headers) try: self.report_lang() urllib2.urlopen(request).read() @@ -506,6 +502,10 @@ class YoutubeIE(InfoExtractor): self.to_stderr(u'WARNING: unable to set language: %s' % str(err)) return + # No authentication to be performed + if username is None: + return + # Log in login_form = { 'current_form': 'loginForm', @@ -941,7 +941,7 @@ if __name__ == '__main__': # Parse command line parser = optparse.OptionParser( usage='Usage: %prog [options] url...', - version='2009.02.07', + version='2009.03.03', conflict_handler='resolve', ) parser.add_option('-h', '--help',