annotate configuration/configuration.py @ 84:34c13cde0255

move towards dict or items system
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 27 Apr 2012 13:39:13 -0700
parents 490687e70723
children 6067ae61cd17
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
1 #!/usr/bin/env python
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
2
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
3 """
66
f3b3f4046a8a better docstring
Jeff Hammel <jhammel@mozilla.com>
parents: 65
diff changeset
4 unified configuration with serialization/deserialization
0
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
5 """
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
6
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
7 import copy
37
a1f8dec4d4f9 we has another broken test
Jeff Hammel <jhammel@mozilla.com>
parents: 36
diff changeset
8 import os
0
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
9 import sys
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
10 import optparse
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
11
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
12 # imports for configuration providers
4
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
13 try:
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
14 import json
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
15 except ImportError:
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
16 try:
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
17 import simplejson as json
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
18 except ImportError:
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
19 json = None
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
20 try:
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
21 import yaml
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
22 except ImportError:
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
23 yaml = None
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
24
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
25 __all__ = ['Configuration',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
26 'configuration_providers',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
27 'types',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
28 'UnknownOptionException',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
29 'MissingValueException',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
30 'ConfigurationProviderException',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
31 'TypeCastException',
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
32 'ConfigurationOption']
36
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
33
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
34 ### exceptions
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
35
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
36 class UnknownOptionException(Exception):
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
37 """exception raised when a non-configuration value is present in the configuration"""
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
38
36
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
39 class MissingValueException(Exception):
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
40 """exception raised when a required value is missing"""
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
41
41
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
42 class ConfigurationProviderException(Exception):
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
43 """exception raised when a configuration provider is missing, etc"""
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
44
46
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
45 class TypeCastException(Exception):
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
46 """exception raised when a configuration item cannot be coerced to a type"""
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
47
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
48
26
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
49 ### configuration providers for serialization/deserialization
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
50
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
51 configuration_providers = []
26
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
52
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
53 class ConfigurationProvider(object):
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
54 """
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
55 abstract base class for configuration providers for
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
56 serialization/deserialization
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
57 """
27
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
58 def read(self, filename):
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
59 raise NotImplementedError("Abstract base class")
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
60
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
61 def write(self, config, filename):
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
62 if isinstance(filename, basestring):
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
63 f = file(filename, 'w')
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
64 newfile = True
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
65 else:
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
66 f = filename
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
67 newfile = False
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
68 try:
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
69 self._write(f, config)
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
70 finally:
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
71 # XXX try: finally: works in python >= 2.5
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
72 if newfile:
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
73 f.close()
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
74 def _write(self, fp, config):
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
75 raise NotImplementedError("Abstract base class")
26
4fd88b1b08d5 ABC-ing configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 25
diff changeset
76
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
77 if json:
38
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
78 class JSON(ConfigurationProvider):
27
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
79 indent = 2
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
80 extensions = ['json']
7
6e3cf8f05464 note TODO: reading JSON
Jeff Hammel <jhammel@mozilla.com>
parents: 6
diff changeset
81 def read(self, filename):
9
b28ec204df23 flush out JSON provider
Jeff Hammel <jhammel@mozilla.com>
parents: 8
diff changeset
82 return json.loads(file(filename).read())
27
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
83 def _write(self, fp, config):
38
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
84 fp.write(json.dumps(config, indent=self.indent, sort_keys=True))
27
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
85 # TODO: could use templates to get order down, etc
30
b27a7cb2dd5b stub test for configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 29
diff changeset
86 configuration_providers.append(JSON())
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
87
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
88 if yaml:
38
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
89 class YAML(ConfigurationProvider):
30
b27a7cb2dd5b stub test for configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 29
diff changeset
90 extensions = ['yml', 'yaml']
5
7910b0ef0bab stub configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 4
diff changeset
91 def read(self, filename):
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
92 f = file(filename)
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
93 config = yaml.load(f)
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
94 f.close()
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
95 return config
27
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
96 def _write(self, fp, config):
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
97 fp.write(yaml.dump(config))
c6d966431498 add serialization details
Jeff Hammel <jhammel@mozilla.com>
parents: 26
diff changeset
98 # TODO: could use templates to get order down, etc
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
99
30
b27a7cb2dd5b stub test for configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 29
diff changeset
100 configuration_providers.append(YAML())
b27a7cb2dd5b stub test for configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 29
diff changeset
101
50
113e8c2f7cab start to hook up deserializers
Jeff Hammel <jhammel@mozilla.com>
parents: 49
diff changeset
102 # TODO: add a configuration provider for taking command-line arguments
113e8c2f7cab start to hook up deserializers
Jeff Hammel <jhammel@mozilla.com>
parents: 49
diff changeset
103 # from a file
113e8c2f7cab start to hook up deserializers
Jeff Hammel <jhammel@mozilla.com>
parents: 49
diff changeset
104
30
b27a7cb2dd5b stub test for configuration providers
Jeff Hammel <jhammel@mozilla.com>
parents: 29
diff changeset
105 __all__.extend([i.__class__.__name__ for i in configuration_providers])
4
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
106
44
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
107 ### optparse interface
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
108
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
109 class ConfigurationOption(optparse.Option):
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
110 """option that keeps track if it is seen"""
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
111 # TODO: this should be configurable or something
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
112 def take_action(self, action, dest, opt, value, values, parser):
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
113 optparse.Option.take_action(self, action, dest, opt, value, values, parser)
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
114
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
115 # add the parsed option to the set of things parsed
44
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
116 if not hasattr(parser, 'parsed'):
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
117 parser.parsed = set()
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
118 parser.parsed.add(dest)
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
119
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
120 # switch on types
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
121 formatter = getattr(parser, 'cli_formatter')
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
122 if formatter:
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
123 formatter = formatter(dest)
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
124 setattr(values, dest, formatter(getattr(values, dest)))
44
b3db38b14567 stub adding an option of keeping track of what is parsed
Jeff Hammel <jhammel@mozilla.com>
parents: 43
diff changeset
125
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
126 ### plugins for option types
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
127 ### TODO: this could use a bit of thought
31
5571d1608cba add comments
Jeff Hammel <jhammel@mozilla.com>
parents: 30
diff changeset
128 ### They should probably be classes
80
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
129 # class Option(object):
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
130 # def arguments(self, name, value):
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
131 # """return arguments appropriate for construction of an optparse.Option
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
132 # def take_action(self, ...):
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
133 # """do something appropriate based on type"""
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
134
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
135 class BaseCLI(object):
80
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
136 """base_cli for all option types"""
35416ad14098 notes to self about how to make this better; still needs a little thought
Jeff Hammel <jhammel@mozilla.com>
parents: 78
diff changeset
137
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
138 def __call__(self, name, value):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
139 """return args, kwargs needed to instantiate an optparse option"""
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
140
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
141 args = value.get('flags', ['--%s' % name])
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
142 if not args:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
143 # No CLI interface
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
144 return (), {}
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
145
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
146 kw = {'dest': name}
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
147 help = value.get('help', name)
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
148 if 'default' in value:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
149 kw['default'] = value['default']
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
150 help += ' [DEFAULT: %s]' % value['default']
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
151 kw['help'] = help
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
152 kw['action'] = 'store'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
153 return args, kw
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
154
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
155 def take_action(self, value):
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
156 return value
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
157
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
158 class BoolCLI(BaseCLI):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
159
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
160 def __call__(self, name, value):
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
161
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
162 # preserve the default values
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
163 help = value.get('help')
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
164 flags = value.get('flags')
23
73e72a764c3a fix bool parser, i hope
Jeff Hammel <jhammel@mozilla.com>
parents: 21
diff changeset
165
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
166 args, kw = BaseCLI.__call__(self, name, value)
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
167 kw['help'] = help # reset
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
168 if value.get('default'):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
169 kw['action'] = 'store_false'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
170 if not flags:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
171 args = ['--no-%s' % name]
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
172 if not help:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
173 kw['help'] = 'disable %s' % name
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
174 else:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
175 kw['action'] = 'store_true'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
176 if not help:
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
177 kw['help'] = 'enable %s' % name
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
178 return args, kw
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
179
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
180 class ListCLI(BaseCLI):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
181
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
182 def __call__(self, name, value):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
183 args, kw = BaseCLI.__call__(self, name, value)
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
184
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
185 # TODO: could use 'extend'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
186 # - http://hg.mozilla.org/build/mozharness/file/5f44ba08f4be/mozharness/base/config.py#l41
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
187
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
188 # TODO: what about nested types?
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
189 kw['action'] = 'append'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
190 return args, kw
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
191
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
192 class IntCLI(BaseCLI):
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
193
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
194 def __call__(self, name, value):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
195 args, kw = BaseCLI.__call__(self, name, value)
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
196 kw['type'] = 'int'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
197 return args, kw
23
73e72a764c3a fix bool parser, i hope
Jeff Hammel <jhammel@mozilla.com>
parents: 21
diff changeset
198
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
199 class FloatCLI(BaseCLI):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
200
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
201 def __call__(self, name, value):
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
202 args, kw = BaseCLI.__call__(self, name, value)
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
203 kw['type'] = 'float'
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
204 return args, kw
23
73e72a764c3a fix bool parser, i hope
Jeff Hammel <jhammel@mozilla.com>
parents: 21
diff changeset
205
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
206 class DictCLI(ListCLI):
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
207
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
208 delimeter = '='
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
209
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
210 def take_action(self, value):
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
211 bad = [i for i in value if self.delimeter not in i]
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
212 if bad:
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
213 raise AssertionError("Each value must be delimited by '%s': %s" % (self.delimeter, bad))
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
214 return dict([i.split(self.delimeter, 1) for i in value])
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
215
60
4f5ea5a8ccb0 another TODO
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
216 # TODO: 'dict'-type cli interface
4f5ea5a8ccb0 another TODO
Jeff Hammel <jhammel@mozilla.com>
parents: 59
diff changeset
217
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
218 types = {bool: BoolCLI(),
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
219 int: IntCLI(),
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
220 float: FloatCLI(),
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
221 list: ListCLI(),
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
222 dict: DictCLI(),
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
223 None: BaseCLI()} # default
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
224
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
225 __all__ += [i.__class__.__name__ for i in types.values()]
4
92e1b2dd60c8 more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 2
diff changeset
226
59
b8f066b8ab62 begin migration path towards inheriting from ConfigParser; ideally, Configuration should live in its own class and the CLI class should inherit from that
Jeff Hammel <jhammel@mozilla.com>
parents: 54
diff changeset
227 class Configuration(optparse.OptionParser):
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
228 """declarative configuration object"""
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
229
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
230 options = {} # configuration basis
1
1dbdb4a57e0c stub configuration class
Jeff Hammel <jhammel@mozilla.com>
parents: 0
diff changeset
231
75
c119eb07a378 rename/shuffle options to make more sense
Jeff Hammel <jhammel@mozilla.com>
parents: 67
diff changeset
232 def __init__(self, configuration_providers=configuration_providers, types=types, load=None, dump='--dump', **parser_args):
61
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
233
84
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
234 # sanity check
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
235 if isinstance(self.options, dict):
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
236 self.option_dict = self.options
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
237 elif isinstance(self.options, list):
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
238 # XXX could also be tuple, etc
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
239 self.option_dict = dict(self.options)
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
240 else:
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
241 raise NotImplementedError
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
242
61
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
243 # setup configuration
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
244 self.config = {}
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
245 self.configuration_providers = configuration_providers
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
246 self.types = types
61
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
247
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
248 # setup optionparser
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
249 if 'description' not in parser_args:
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
250 parser_args['description'] = getattr(self, '__doc__', '')
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
251 if 'formatter' not in parser_args:
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
252 class PlainDescriptionFormatter(optparse.IndentedHelpFormatter):
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
253 """description formatter for console script entry point"""
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
254 def format_description(self, description):
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
255 if description:
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
256 return description.strip() + '\n'
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
257 else:
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
258 return ''
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
259 parser_args['formatter'] = PlainDescriptionFormatter()
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
260 parser_args.setdefault('option_class', ConfigurationOption)
59
b8f066b8ab62 begin migration path towards inheriting from ConfigParser; ideally, Configuration should live in its own class and the CLI class should inherit from that
Jeff Hammel <jhammel@mozilla.com>
parents: 54
diff changeset
261 optparse.OptionParser.__init__(self, **parser_args)
61
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
262 self.parsed = set()
ef2d1c6211b9 more stubbing to make Configuration an OptionParser
Jeff Hammel <jhammel@mozilla.com>
parents: 60
diff changeset
263 self.optparse_options(self)
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
264 # add option(s) for configuration_providers
75
c119eb07a378 rename/shuffle options to make more sense
Jeff Hammel <jhammel@mozilla.com>
parents: 67
diff changeset
265 if load:
c119eb07a378 rename/shuffle options to make more sense
Jeff Hammel <jhammel@mozilla.com>
parents: 67
diff changeset
266 self.add_option(load,
c119eb07a378 rename/shuffle options to make more sense
Jeff Hammel <jhammel@mozilla.com>
parents: 67
diff changeset
267 dest='load', action='append',
c119eb07a378 rename/shuffle options to make more sense
Jeff Hammel <jhammel@mozilla.com>
parents: 67
diff changeset
268 help="load configuration from a file")
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
269
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
270 # add an option for dumping
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
271 formats = self.formats()
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
272 if formats and dump:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
273 self.add_option(dump, dest='dump',
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
274 help="dump configuration to a file; Formats: %s" % formats)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
275
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
276
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
277 ### methods for iteration
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
278 ### TODO: make the class a real iterator
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
279
11
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
280 def items(self):
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
281 # TODO: allow options to be a list of 2-tuples
84
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
282 if isinstance(self.options, dict):
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
283 return self.options.items()
34c13cde0255 move towards dict or items system
Jeff Hammel <jhammel@mozilla.com>
parents: 82
diff changeset
284 return self.options
11
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
285
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
286 ### methods for validating configuration
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
287
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
288 def check(self, config):
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
289 """
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
290 check validity of configuration to be added
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
291 """
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
292
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
293 # ensure options in configuration are in self.options
25
b39e550402ea we now update configuration correctly
Jeff Hammel <jhammel@mozilla.com>
parents: 24
diff changeset
294 unknown_options = [i for i in config if i not in self.options]
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
295 if unknown_options:
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
296 raise UnknownOptionException("Unknown options: %s" % ', '.join(unknown_options))
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
297
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
298 # ensure options are of the right type (if specified)
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
299 for key, value in config.items():
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
300 _type = self.options[key].get('type')
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
301 if _type is None and 'default' in self.options[key]:
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
302 _type = type(self.options[key]['default'])
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
303 if _type is not None and not isinstance(value, _type):
46
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
304 try:
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
305 config[key] = _type(value)
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
306 except BaseException, e:
346c702f63db better error message
Jeff Hammel <jhammel@mozilla.com>
parents: 45
diff changeset
307 raise TypeCastException("Could not coerce %s, %s, to type %s: %s" % (key, value, _type.__name__, e))
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
308
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
309 return config
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
310
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
311 def validate(self):
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
312 """validate resultant configuration"""
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
313
78
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
314 for key, value in self.items():
35
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
315 if key not in self.config:
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
316 required = value.get('required')
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
317 if required:
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
318 if isinstance(required, basestring):
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
319 required_message = required
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
320 else:
321fe58a9eae flush out validate function
Jeff Hammel <jhammel@mozilla.com>
parents: 34
diff changeset
321 required_message = "Parameter %s is required but not present" % key
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
322 # TODO: this should probably raise all missing values vs
37
a1f8dec4d4f9 we has another broken test
Jeff Hammel <jhammel@mozilla.com>
parents: 36
diff changeset
323 # one by one
36
d218df4d0b4c add test for missing values
Jeff Hammel <jhammel@mozilla.com>
parents: 35
diff changeset
324 raise MissingValueException(required_message)
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
325 # TODO: configuration should be locked after this is called
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
326
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
327 ### methods for adding configuration
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
328
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
329 def __call__(self, *args):
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
330 """add items to configuration and check it"""
67
c831eb58fb52 minor fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 66
diff changeset
331
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
332 for config in args:
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
333 self.add(config)
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
334
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
335 # add defaults if not present
78
Jeff Hammel <jhammel@mozilla.com>
parents: 75
diff changeset
336 for key, value in self.items():
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
337 if 'default' in value and key not in self.config:
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
338 self.config[key] = value['default']
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
339
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
340 # validate total configuration
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
341 self.validate()
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
342 # TODO: configuration should be locked after this is called
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
343
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
344 def add(self, config, check=True):
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
345 """update configuration: not undoable"""
6
dce954a3831f more stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 5
diff changeset
346
24
39f2611db9be rename a bunch of things and begin to work on the sanity of validation
Jeff Hammel <jhammel@mozilla.com>
parents: 23
diff changeset
347 self.check(config) # check config to be added
2
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
348 self.config.update(config)
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
349 # TODO: option to extend; augment lists/dicts
35f57b21885f no stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 1
diff changeset
350
18
d8871956536e remove cruft and start to organize
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
351 ### methods for optparse
d8871956536e remove cruft and start to organize
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
352 ### XXX could go in a subclass
d8871956536e remove cruft and start to organize
Jeff Hammel <jhammel@mozilla.com>
parents: 17
diff changeset
353
82
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
354 def cli_formatter(self, option):
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
355 handler = self.types[self.options[option].get('type')]
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
356 return getattr(handler, 'take_action', lambda x: 1)
490687e70723 add a dict parser thingy
Jeff Hammel <jhammel@mozilla.com>
parents: 81
diff changeset
357
17
a78ab14ae376 separate thing to add options to its own function
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
358 def optparse_options(self, parser):
a78ab14ae376 separate thing to add options to its own function
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
359 """add optparse options to a OptionParser instance"""
11
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
360 for key, value in self.items():
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
361 handler = self.types[value.get('type')]
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
362 args, kw = handler(key, value)
11
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
363 if not args:
21
0fe74db6a56c a hacky way to do CLI types handlers
Jeff Hammel <jhammel@mozilla.com>
parents: 20
diff changeset
364 # No CLI interface
11
e00afe2c83bf stubbing configuration parser
Jeff Hammel <jhammel@mozilla.com>
parents: 10
diff changeset
365 continue
12
db43d30afcf5 note pattern to use
Jeff Hammel <jhammel@mozilla.com>
parents: 11
diff changeset
366 parser.add_option(*args, **kw)
17
a78ab14ae376 separate thing to add options to its own function
Jeff Hammel <jhammel@mozilla.com>
parents: 15
diff changeset
367
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
368 def parse_args(self, *args, **kw):
81
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
369
f3b2563b2a91 move to a class-based architecture
Jeff Hammel <jhammel@mozilla.com>
parents: 80
diff changeset
370 self.parsed = set()
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
371 options, args = optparse.OptionParser.parse_args(self, *args, **kw)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
372
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
373 # get CLI configuration options
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
374 cli_config = dict([(key, value) for key, value in options.__dict__.items()
64
a8013bd3126a minor bug fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
375 if key in self.options and key in self.parsed])
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
376
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
377 # deserialize configuration
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
378 configuration_files = getattr(options, 'load', args)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
379 missing = [i for i in configuration_files
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
380 if not os.path.exists(i)]
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
381 if missing:
64
a8013bd3126a minor bug fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
382 self.error("Missing files: %s" % ', '.join(missing))
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
383 config = []
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
384 for f in configuration_files:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
385 try:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
386 config.append(self.deserialize(f))
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
387 except BaseException, e:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
388 parser.error(str(e))
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
389 config.append(cli_config)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
390
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
391 missingvalues = None
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
392 try:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
393 # generate configuration
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
394 self(*config)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
395 except MissingValueException, missingvalues:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
396 pass
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
397
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
398 # dump configuration, if specified
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
399 dump = getattr(options, 'dump')
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
400 if dump:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
401 # TODO: have a way of specifying format other than filename
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
402 self.serialize(dump)
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
403
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
404 if missingvalues and not dump:
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
405 # XXX assuming if you don't have values you were just dumping
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
406 raise missingvalues
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
407
64
a8013bd3126a minor bug fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
408 # update options from config
a8013bd3126a minor bug fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
409 options.__dict__.update(self.config)
a8013bd3126a minor bug fixes
Jeff Hammel <jhammel@mozilla.com>
parents: 63
diff changeset
410
63
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
411 # return parsed arguments
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
412 return options, args
e7005b75ef8d still refactorin
Jeff Hammel <jhammel@mozilla.com>
parents: 62
diff changeset
413
28
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
414 ### serialization/deserialization
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
415
43
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
416 def formats(self):
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
417 """formats for deserialization"""
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
418 retval = []
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
419 for provider in self.configuration_providers:
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
420 if provider.extensions and hasattr(provider, 'write'):
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
421 retval.append(provider.extensions[0])
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
422 return retval
f09982d47b3c add --dump option
Jeff Hammel <jhammel@mozilla.com>
parents: 41
diff changeset
423
28
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
424 def configuration_provider(self, format):
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
425 """configuration provider guess for a given filename"""
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
426 for provider in self.configuration_providers:
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
427 if format in provider.extensions:
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
428 return provider
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
429
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
430 def filename2format(self, filename):
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
431 extension = os.path.splitext(filename)[-1]
38
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
432 return extension.lstrip('.') or None
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
433
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
434 def serialize(self, filename, format=None, full=False):
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
435 """
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
436 serialize configuration to a file
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
437 - filename: path of file to serialize to
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
438 - format: format of configuration provider
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
439 - full: whether to serialize non-set optional strings [TODO]
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
440 """
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
441 # TODO: allow file object vs file name
28
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
442
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
443 if not format:
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
444 format = self.filename2format(filename)
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
445 if not format:
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
446 raise Exception('Please specify a format')
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
447 # TODO: more specific exception type
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
448
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
449 provider = self.configuration_provider(format)
38
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
450 if not provider:
8909ae1cc4ea fix serialization (stub) tests
Jeff Hammel <jhammel@mozilla.com>
parents: 37
diff changeset
451 raise Exception("Provider not found for format: %s" % format)
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
452
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
453 config = copy.deepcopy(self.config)
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
454
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
455 provider.write(config, filename)
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
456
28
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
457 def deserialize(self, filename, format=None):
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
458 """load configuration from a file"""
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
459 # TODO: allow file object vs file name
28
c516ab813079 begin stubbing serialization/deserialization
Jeff Hammel <jhammel@mozilla.com>
parents: 27
diff changeset
460
50
113e8c2f7cab start to hook up deserializers
Jeff Hammel <jhammel@mozilla.com>
parents: 49
diff changeset
461 assert os.path.exists(filename)
113e8c2f7cab start to hook up deserializers
Jeff Hammel <jhammel@mozilla.com>
parents: 49
diff changeset
462
41
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
463 # get the format
29
fadcc6ab51d4 more (de/)serialization stubbing
Jeff Hammel <jhammel@mozilla.com>
parents: 28
diff changeset
464 if not format:
41
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
465 format = self.filename2format(filename)
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
466
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
467 # get the providers in some sensible order
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
468 providers = self.configuration_providers[:]
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
469 if format:
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
470 providers.sort(key=lambda x: int(format in x.extensions), reverse=True)
34
79aca36abd9a fill in defaults if not present
Jeff Hammel <jhammel@mozilla.com>
parents: 31
diff changeset
471
41
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
472 # deserialize the data
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
473 for provider in providers:
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
474 try:
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
475 return provider.read(filename)
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
476 except:
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
477 continue
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
478 else:
1bd4ddf2e81d deserialization should work now
Jeff Hammel <jhammel@mozilla.com>
parents: 38
diff changeset
479 raise ConfigurationProviderException("Could not load %s" % filename)