Show More
@@ -21,10 +21,9 b' from . import (' | |||||
21 |
|
21 | |||
22 |
|
22 | |||
23 | class config(object): |
|
23 | class config(object): | |
24 |
def __init__(self, data=None |
|
24 | def __init__(self, data=None): | |
25 | self._data = {} |
|
25 | self._data = {} | |
26 | self._unset = [] |
|
26 | self._unset = [] | |
27 | self._includepaths = includepaths or [] |
|
|||
28 | if data: |
|
27 | if data: | |
29 | for k in data._data: |
|
28 | for k in data._data: | |
30 | self._data[k] = data[k].copy() |
|
29 | self._data[k] = data[k].copy() | |
@@ -162,14 +161,11 b' class config(object):' | |||||
162 |
|
161 | |||
163 | if m and include: |
|
162 | if m and include: | |
164 | expanded = util.expandpath(m.group(1)) |
|
163 | expanded = util.expandpath(m.group(1)) | |
165 |
inc |
|
164 | inc = os.path.normpath( | |
166 |
|
165 | os.path.join(os.path.dirname(src), expanded) | ||
167 | for base in includepaths: |
|
166 | ) | |
168 | inc = os.path.normpath(os.path.join(base, expanded)) |
|
|||
169 |
|
||||
170 |
|
|
167 | try: | |
171 |
|
|
168 | include(expanded, inc, remap=remap, sections=sections) | |
172 | break |
|
|||
173 |
|
|
169 | except IOError as inst: | |
174 |
|
|
170 | if inst.errno != errno.ENOENT: | |
175 |
|
|
171 | raise error.ParseError( |
General Comments 0
You need to be logged in to leave comments.
Login now