mirror of
				https://code.hackerspace.pl/q3k/youtube-dl
				synced 2025-03-16 11:43:02 +00:00 
			
		
		
		
	[options] Do not decode Unicode on Python 2.x
The configuration file contents are being returned as unicode now, so decoding them is no longer necessary. (Run python2 with -3 to see the warning before this commit)
This commit is contained in:
		
							parent
							
								
									571808a7aa
								
							
						
					
					
						commit
						30d22dae8e
					
				| @ -812,11 +812,11 @@ def parseOpts(overrideArguments=None): | ||||
|             system_conf = [] | ||||
|             user_conf = [] | ||||
|         else: | ||||
|             system_conf = compat_conf(_readOptions('/etc/youtube-dl.conf')) | ||||
|             system_conf = _readOptions('/etc/youtube-dl.conf') | ||||
|             if '--ignore-config' in system_conf: | ||||
|                 user_conf = [] | ||||
|             else: | ||||
|                 user_conf = compat_conf(_readUserConf()) | ||||
|                 user_conf = _readUserConf() | ||||
|         argv = system_conf + user_conf + command_line_conf | ||||
| 
 | ||||
|         opts, args = parser.parse_args(argv) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Philipp Hagemeister
						Philipp Hagemeister