Changeset d40ffbb in mainline

Timestamp:

2010-12-06T12:29:04Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3c3172

Parents:

8fe3f832

Message:

coding style fixes (no change in functionality)

• consistent tab indentation
• no tabs for non-indentation
• non-yoda function names

File:

• tools/config.py (modified) (14 diffs)

tools/config.py

@@ -47 +47 @@
 
 def read_config(fname, config):
-        "Read saved values from last configuration run"
+        "Read saved values from last configuration run or a preset file"
         
         inf = open(fname, 'r')
@@ -218 +218 @@
 # and verify that all variables have a value (previously specified or inferred).
 #
-# @param config Configuration to work on
-# @param rules  Rules
-#
-# @return       True if configuration is complete and valid, False
-#               otherwise.
+# @param config Configuration to work on
+# @param rules  Rules
+#
+# @return True if configuration is complete and valid, False
+#         otherwise.
 #
 def infer_verify_choices(config, rules):
@@ -229 +229 @@
         for rule in rules:
                 varname, vartype, name, choices, cond = rule
-
+                
                 if cond and (not check_condition(cond, config, rules)):
                         continue
@@ -237 +237 @@
                 else:
                         value = config[varname]
-
-                if not rule_value_is_valid(rule, value):
+                
+                if not validate_rule_value(rule, value):
                         value = None
-
-                default = rule_get_default(rule)
+                
+                default = get_default_rule(rule)
                 if default != None:
                         config[varname] = default
-
+                
                 if not varname in config:
                         return False
@@ -251 +251 @@
 
 ## Get default value from a rule.
-def rule_get_default(rule):
+def get_default_rule(rule):
         varname, vartype, name, choices, cond = rule
-
+        
         default = None
-
+        
         if vartype == 'choice':
                 # If there is just one option, use it
@@ -270 +270 @@
         else:
                 raise RuntimeError("Unknown variable type: %s" % vartype)
-
+        
         return default
 
 ## Get option from a rule.
 #
-# @param rule   Rule for a variable
-# @param value  Current value of the variable
+# @param rule  Rule for a variable
+# @param value Current value of the variable
 #
 # @return Option (string) to ask or None which means not to ask.
 #
-def rule_get_option(rule, value):
+def get_rule_option(rule, value):
         varname, vartype, name, choices, cond = rule
-
+        
         option = None
-
+        
         if vartype == 'choice':
                 # If there is just one option, don't ask
@@ -302 +302 @@
         else:
                 raise RuntimeError("Unknown variable type: %s" % vartype)
-
+        
         return option
 
 ## Check if variable value is valid.
 #
-# @param rule   Rule for the variable
-# @param value  Value of the variable
-#
-# @return       True if valid, False if not valid.
-#
-def rule_value_is_valid(rule, value):
+# @param rule  Rule for the variable
+# @param value Value of the variable
+#
+# @return True if valid, False if not valid.
+#
+def validate_rule_value(rule, value):
         varname, vartype, name, choices, cond = rule
         
         if value == None:
                 return True
-
+        
         if vartype == 'choice':
                 if not value in [choice[0] for choice in choices]:
@@ -335 +335 @@
         else:
                 raise RuntimeError("Unknown variable type: %s" % vartype)
-
+        
         return True
 
@@ -415 +415 @@
 ## Ask user to choose a configuration profile.
 #
-def profile_choose(root, fname, screen, config):
+def choose_profile(root, fname, screen, config):
         options = []
         opt2path = {}
@@ -453 +453 @@
 ## Read presets from a configuration profile.
 #
-# @param profile        Profile to load from (a list of string components)
-# @param config         Output configuration
-#
-def presets_read(profile, config):
+# @param profile Profile to load from (a list of string components)
+# @param config  Output configuration
+#
+def read_presets(profile, config):
         path = os.path.join(PRESETS_DIR, profile[0], MAKEFILE)
         read_config(path, config)
-
+        
         if len(profile) > 1:
                 path = os.path.join(PRESETS_DIR, profile[0], profile[1], MAKEFILE)
@@ -466 +466 @@
 ## Parse profile name (relative OS path) into a list of components.
 #
-# @param profile_name   Relative path (using OS separator)
-# @return               List of components
+# @param profile_name Relative path (using OS separator)
+# @return             List of components
 #
 def parse_profile_name(profile_name):
         profile = []
-
+        
         head, tail = os.path.split(profile_name)
         if head != '':
                 profile.append(head)
-
+        
         profile.append(tail)
         return profile
@@ -491 +491 @@
         if len(sys.argv) >= 4:
                 profile = parse_profile_name(sys.argv[3])
-                presets_read(profile, config)
+                read_presets(profile, config)
         elif os.path.exists(MAKEFILE):
                 read_config(MAKEFILE, config)
@@ -538 +538 @@
                                         value = config[varname]
                                 
-                                if not rule_value_is_valid(rule, value):
+                                if not validate_rule_value(rule, value):
                                         value = None
-
-                                default = rule_get_default(rule)
+                                
+                                default = get_default_rule(rule)
                                 if default != None:
                                         if value == None:
                                                 value = default
                                         config[varname] = value
-
-                                option = rule_get_option(rule, value)
+                                
+                                option = get_rule_option(rule, value)
                                 if option != None:
                                         options.append(option)
@@ -573 +573 @@
                         
                         if value == 0:
-                                profile = profile_choose(PRESETS_DIR, MAKEFILE, screen, config)
+                                profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
                                 if profile != None:
-                                        presets_read(profile, config)
+                                        read_presets(profile, config)
                                 position = 1
                                 continue