summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Hegner <hegner@cern.ch>2016-05-11 00:28:12 +0200
committerBenedikt Hegner <hegner@cern.ch>2016-05-11 00:28:12 +0200
commitc1e6b5218438988d7dc2da5ca577fe5a8752d6e1 (patch)
tree558e5e921e0a318e0959a68ee8e8bcfa54cee7dc
parent05b6c3f8cfd065dcf4173613a64ed94fa1815d31 (diff)
downloadspack-c1e6b5218438988d7dc2da5ca577fe5a8752d6e1.tar.gz
spack-c1e6b5218438988d7dc2da5ca577fe5a8752d6e1.tar.bz2
spack-c1e6b5218438988d7dc2da5ca577fe5a8752d6e1.tar.xz
spack-c1e6b5218438988d7dc2da5ca577fe5a8752d6e1.zip
first round of coding rules
-rw-r--r--lib/spack/spack/config.py29
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py
index 3bdefd3a6c..9da5d7aaf0 100644
--- a/lib/spack/spack/config.py
+++ b/lib/spack/spack/config.py
@@ -129,7 +129,6 @@ from ordereddict_backport import OrderedDict
import llnl.util.tty as tty
from llnl.util.filesystem import mkdirp
-import copy
import spack
from spack.error import SpackError
@@ -306,13 +305,14 @@ def extend_with_default(validator_class):
yield err
return validators.extend(validator_class, {
- "properties" : set_defaults,
- "patternProperties" : set_pp_defaults
+ "properties": set_defaults,
+ "patternProperties": set_pp_defaults
})
DefaultSettingValidator = extend_with_default(Draft4Validator)
+
def validate_section(data, schema):
"""Validate data read in from a Spack YAML file.
@@ -347,16 +347,14 @@ class ConfigScope(object):
validate_section_name(section)
return os.path.join(self.path, "%s.yaml" % section)
-
def get_section(self, section):
- if not section in self.sections:
+ if section not in self.sections:
path = self.get_section_filename(section)
schema = section_schemas[section]
data = _read_config_file(path, schema)
self.sections[section] = data
return self.sections[section]
-
def write_section(self, section):
filename = self.get_section_filename(section)
data = self.get_section(section)
@@ -370,7 +368,6 @@ class ConfigScope(object):
except (yaml.YAMLError, IOError) as e:
raise ConfigFileError("Error writing to config file: '%s'" % str(e))
-
def clear(self):
"""Empty cached config information."""
self.sections = {}
@@ -476,7 +473,7 @@ def _merge_yaml(dest, source):
# Source dict is merged into dest.
elif they_are(dict):
for sk, sv in source.iteritems():
- if not sk in dest:
+ if sk not in dest:
dest[sk] = copy.copy(sv)
else:
dest[sk] = _merge_yaml(dest[sk], source[sk])
@@ -590,16 +587,20 @@ def spec_externals(spec):
def is_spec_buildable(spec):
"""Return true if the spec pkgspec is configured as buildable"""
allpkgs = get_config('packages')
- name = spec.name
- if not spec.name in allpkgs:
+ if spec.name not in allpkgs:
return True
- if not 'buildable' in allpkgs[spec.name]:
+ if 'buildable' not in allpkgs[spec.name]:
return True
return allpkgs[spec.name]['buildable']
-class ConfigError(SpackError): pass
-class ConfigFileError(ConfigError): pass
+class ConfigError(SpackError):
+ pass
+
+
+class ConfigFileError(ConfigError):
+ pass
+
def get_path(path, data):
if path:
@@ -607,6 +608,7 @@ def get_path(path, data):
else:
return data
+
class ConfigFormatError(ConfigError):
"""Raised when a configuration format does not match its schema."""
def __init__(self, validation_error, data):
@@ -641,5 +643,6 @@ class ConfigFormatError(ConfigError):
message = '%s: %s' % (location, validation_error.message)
super(ConfigError, self).__init__(message)
+
class ConfigSanityError(ConfigFormatError):
"""Same as ConfigFormatError, raised when config is written by Spack."""