|  | @@ -2270,14 +2270,10 @@ if __name__ == '__main__':
 | 
	
		
			
				|  |  |  		video_format = optparse.OptionGroup(parser, 'Video Format Options')
 | 
	
		
			
				|  |  |  		video_format.add_option('-f', '--format',
 | 
	
		
			
				|  |  |  				action='store', dest='format', metavar='FORMAT', help='video format code')
 | 
	
		
			
				|  |  | -		video_format.add_option('-m', '--mobile-version',
 | 
	
		
			
				|  |  | -				action='store_const', dest='format', help='alias for -f 17', const='17')
 | 
	
		
			
				|  |  |  		video_format.add_option('--all-formats',
 | 
	
		
			
				|  |  |  				action='store_const', dest='format', help='download all available video formats', const='-1')
 | 
	
		
			
				|  |  |  		video_format.add_option('--max-quality',
 | 
	
		
			
				|  |  |  				action='store', dest='format_limit', metavar='FORMAT', help='highest quality format to download')
 | 
	
		
			
				|  |  | -		video_format.add_option('-b', '--best-quality',
 | 
	
		
			
				|  |  | -				action='store_true', dest='bestquality', help='download the best video quality (DEPRECATED)')
 | 
	
		
			
				|  |  |  		parser.add_option_group(video_format)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
 | 
	
	
		
			
				|  | @@ -2351,8 +2347,6 @@ if __name__ == '__main__':
 | 
	
		
			
				|  |  |  		all_urls = batchurls + args
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		# Conflicting, missing and erroneous options
 | 
	
		
			
				|  |  | -		if opts.bestquality:
 | 
	
		
			
				|  |  | -			print >>sys.stderr, u'\nWARNING: -b/--best-quality IS DEPRECATED AS IT IS THE DEFAULT BEHAVIOR NOW\n'
 | 
	
		
			
				|  |  |  		if opts.usenetrc and (opts.username is not None or opts.password is not None):
 | 
	
		
			
				|  |  |  			parser.error(u'using .netrc conflicts with giving username/password')
 | 
	
		
			
				|  |  |  		if opts.password is not None and opts.username is None:
 |