소스 검색

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.
Ricardo Garcia 16 년 전
부모
커밋
cc10940385
1개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 5 5
      youtube-dl

+ 5 - 5
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',