diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 474: fix some pylint warnings in config.py

Message ID 20121202044611.21737.20126.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Andy Doan Dec. 2, 2012, 4:46 a.m. UTC 
------------------------------------------------------------
revno: 474
committer: Andy Doan <andy.doan@linaro.org>
branch nick: device-list
timestamp: Fri 2012-11-30 13:13:30 -0600
message:
  fix some pylint warnings in config.py
modified:
  lava_dispatcher/config.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2012-11-30 01:54:29 +0000
+++ lava_dispatcher/config.py	2012-11-30 19:13:30 +0000
@@ -23,15 +23,15 @@ 
 import StringIO
 import logging
 
-
 from configglue import parser, schema
 
+
 class DeviceSchema(schema.Schema):
     android_binary_drivers = schema.StringOption()
     cts_media_url = schema.StringOption()
-    boot_cmds = schema.StringOption(fatal=True) # Can do better here
-    boot_cmds_android = schema.StringOption(fatal=True) # And here
-    boot_cmds_oe = schema.StringOption(fatal=True) # And here?
+    boot_cmds = schema.StringOption(fatal=True)  # Can do better here
+    boot_cmds_android = schema.StringOption(fatal=True)  # And here
+    boot_cmds_oe = schema.StringOption(fatal=True)  # And here?
     boot_options = schema.ListOption()
     boot_linaro_timeout = schema.IntOption(default=300)
     boot_part = schema.IntOption(fatal=True)
@@ -74,9 +74,11 @@ 
     simulator_command = schema.StringOption()
     simulator_axf_files = schema.ListOption()
 
+
 class OptionDescriptor(object):
     def __init__(self, name):
         self.name = name
+
     def __get__(self, inst, cls=None):
         return inst.cp.get('__main__', self.name)
 
@@ -106,8 +108,9 @@ 
 
 class DispatcherConfig(object):
 
-    def __init__(self, cp):
+    def __init__(self, cp, config_dir):
         self.cp = cp
+        self.config_dir = config_dir
 
     for option in DispatcherSchema().options():
         locals()[option.name] = OptionDescriptor(option.name)
@@ -154,20 +157,19 @@ 
     if not config_files:
         raise Exception("no config files named %r found" % (name + ".conf"))
     config_files.reverse()
-    logging.debug("About to read %s" % str(config_files))
+    logging.debug("About to read %s", str(config_files))
     for path in config_files:
         _read_into(path, cp)
     return cp
 
+
 def get_config(config_dir):
     cp = parser.SchemaConfigParser(DispatcherSchema())
     _get_config("lava-dispatcher", config_dir, cp)
     valid, report = cp.is_valid(report=True)
     if not valid:
         logging.warning("dispatcher config is not valid:\n    %s", '\n    '.join(report))
-    c = DispatcherConfig(cp)
-    c.config_dir = config_dir
-    return c
+    return DispatcherConfig(cp, config_dir)
 
 
 def get_device_config(name, config_dir):