]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Fix very wrong code for setting the language
authorRicardo Garcia <sarbalap+freshmeat@gmail.com>
Sun, 1 Mar 2009 23:02:56 +0000 (00:02 +0100)
committerRicardo Garcia <sarbalap+freshmeat@gmail.com>
Sun, 31 Oct 2010 10:23:48 +0000 (11:23 +0100)
It turned out that, despite the program working without apparent errors,
the code for setting the language was completely wrong. First, it didn't
run unless some form of authentication was performed. Second, I
misstyped _LANG_URL as _LOGIN_URL, so the language was not being set at
all! Amazing it still worked.

youtube-dl

index 323897a9c336882a86a74e006e37100748d06cfd..4ddf6227490aeb6b4ed66de0a30d8ebe59e74d6a 100755 (executable)
@@ -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',