Show More
@@ -244,8 +244,14 b' class PyFileConfigLoader(FileConfigLoader):' | |||
|
244 | 244 | # with the parents. |
|
245 | 245 | def load_subconfig(fname): |
|
246 | 246 | loader = PyFileConfigLoader(fname, self.path) |
|
247 | sub_config = loader.load_config() | |
|
248 | self.config._merge(sub_config) | |
|
247 | try: | |
|
248 | sub_config = loader.load_config() | |
|
249 | except IOError: | |
|
250 | # Pass silently if the sub config is not there. This happens | |
|
251 | # when a user us using a profile, but not the default config. | |
|
252 | pass | |
|
253 | else: | |
|
254 | self.config._merge(sub_config) | |
|
249 | 255 | |
|
250 | 256 | # Again, this needs to be a closure and should be used in config |
|
251 | 257 | # files to get the config being loaded. |
@@ -1754,11 +1754,11 b' def expand_path(s):' | |||
|
1754 | 1754 | # alone an empty var. But, we need the $ to remains there (it indicates |
|
1755 | 1755 | # a hidden share). |
|
1756 | 1756 | if os.name=='nt': |
|
1757 | s.replace('$\\', 'IPYTHON_TEMP') | |
|
1758 |
s |
|
|
1757 | s = s.replace('$\\', 'IPYTHON_TEMP') | |
|
1758 | s = os.path.expandvars(os.path.expanduser(s)) | |
|
1759 | 1759 | if os.name=='nt': |
|
1760 |
s |
|
|
1761 |
return s |
|
|
1760 | s = s.replace('IPYTHON_TEMP', '$\\') | |
|
1761 | return s | |
|
1762 | 1762 | |
|
1763 | 1763 | def list_strings(arg): |
|
1764 | 1764 | """Always return a list of strings, given a string or list of strings |
General Comments 0
You need to be logged in to leave comments.
Login now