summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-10 01:36:38 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-10 01:36:38 +0100
commitc06a9fa34f41edf090f4beb385212e44a6e1bb08 (patch)
tree1a80b3c47a55be441ec04d34943c27800f280a0a
parent753fad4adc32b57a0d18518fddd06d2411d09635 (diff)
downloadyoutube-dl-c06a9fa34f41edf090f4beb385212e44a6e1bb08.tar.gz
youtube-dl-c06a9fa34f41edf090f4beb385212e44a6e1bb08.tar.xz
youtube-dl-c06a9fa34f41edf090f4beb385212e44a6e1bb08.zip
Use snake_case instead of camelCase
-rw-r--r--youtube_dl/options.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 048d9992c..9d9195b60 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -734,22 +734,22 @@ def parseOpts(overrideArguments=None):
         if opts.verbose:
             write_string('[debug] Override config: ' + repr(overrideArguments) + '\n')
     else:
-        commandLineConf = sys.argv[1:]
-        if '--ignore-config' in commandLineConf:
-            systemConf = []
-            userConf = []
+        command_line_conf = sys.argv[1:]
+        if '--ignore-config' in command_line_conf:
+            system_conf = []
+            user_conf = []
         else:
-            systemConf = _readOptions('/etc/youtube-dl.conf')
-            if '--ignore-config' in systemConf:
-                userConf = []
+            system_conf = _readOptions('/etc/youtube-dl.conf')
+            if '--ignore-config' in system_conf:
+                user_conf = []
             else:
-                userConf = _readUserConf()
-        argv = systemConf + userConf + commandLineConf
+                user_conf = _readUserConf()
+        argv = system_conf + user_conf + command_line_conf
 
         opts, args = parser.parse_args(argv)
         if opts.verbose:
-            write_string('[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n')
-            write_string('[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n')
-            write_string('[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n')
+            write_string('[debug] System config: ' + repr(_hide_login_info(system_conf)) + '\n')
+            write_string('[debug] User config: ' + repr(_hide_login_info(user_conf)) + '\n')
+            write_string('[debug] Command-line args: ' + repr(_hide_login_info(command_line_conf)) + '\n')
 
     return parser, opts, args