equal
deleted
inserted
replaced
211 assert getattr(fp, 'mode', 'rb') == 'rb', ( |
211 assert getattr(fp, 'mode', 'rb') == 'rb', ( |
212 b'config files must be opened in binary mode, got fp=%r mode=%r' |
212 b'config files must be opened in binary mode, got fp=%r mode=%r' |
213 % (fp, fp.mode,) |
213 % (fp, fp.mode,) |
214 ) |
214 ) |
215 |
215 |
|
216 dir = os.path.dirname(path) |
|
217 |
216 def include(rel, abs, remap, sections): |
218 def include(rel, abs, remap, sections): |
|
219 abs = os.path.normpath(os.path.join(dir, rel)) |
217 self.read(abs, remap=remap, sections=sections) |
220 self.read(abs, remap=remap, sections=sections) |
218 |
221 |
219 self.parse( |
222 self.parse( |
220 path, fp.read(), sections=sections, remap=remap, include=include |
223 path, fp.read(), sections=sections, remap=remap, include=include |
221 ) |
224 ) |