From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Sun, 1 Mar 2009 23:02:56 +0000 (+0100)
Subject: Fix very wrong code for setting the language
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cc109403853bac92861aab7f0fc5f93398c336b0;p=youtube-dl

Fix very wrong code for setting the language

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.
---

diff --git a/youtube-dl b/youtube-dl
index 323897a9c..4ddf62274 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -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',