Show More
@@ -289,7 +289,7 b' class BaseIPythonApplication(Application):' | |||||
289 | except ConfigFileNotFound: |
|
289 | except ConfigFileNotFound: | |
290 | # Only warn if the default config file was NOT being used. |
|
290 | # Only warn if the default config file was NOT being used. | |
291 | if config_file_name in self.config_file_specified: |
|
291 | if config_file_name in self.config_file_specified: | |
292 | msg = self.log.warn |
|
292 | msg = self.log.warning | |
293 | else: |
|
293 | else: | |
294 | msg = self.log.debug |
|
294 | msg = self.log.debug | |
295 | msg("Config file not found, skipping: %s", config_file_name) |
|
295 | msg("Config file not found, skipping: %s", config_file_name) | |
@@ -297,7 +297,7 b' class BaseIPythonApplication(Application):' | |||||
297 | # For testing purposes. |
|
297 | # For testing purposes. | |
298 | if not suppress_errors: |
|
298 | if not suppress_errors: | |
299 | raise |
|
299 | raise | |
300 | self.log.warn("Error loading config file: %s" % |
|
300 | self.log.warning("Error loading config file: %s" % | |
301 | self.config_file_name, exc_info=True) |
|
301 | self.config_file_name, exc_info=True) | |
302 |
|
302 | |||
303 | def init_profile_dir(self): |
|
303 | def init_profile_dir(self): | |
@@ -364,7 +364,7 b' class BaseIPythonApplication(Application):' | |||||
364 |
|
364 | |||
365 | cfg = self.config_file_name |
|
365 | cfg = self.config_file_name | |
366 | if path and os.path.exists(os.path.join(path, cfg)): |
|
366 | if path and os.path.exists(os.path.join(path, cfg)): | |
367 | self.log.warn("Staging %r from %s into %r [overwrite=%s]"%( |
|
367 | self.log.warning("Staging %r from %s into %r [overwrite=%s]"%( | |
368 | cfg, src, self.profile_dir.location, self.overwrite) |
|
368 | cfg, src, self.profile_dir.location, self.overwrite) | |
369 | ) |
|
369 | ) | |
370 | self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite) |
|
370 | self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite) | |
@@ -379,7 +379,7 b' class BaseIPythonApplication(Application):' | |||||
379 | cfg = os.path.basename(fullpath) |
|
379 | cfg = os.path.basename(fullpath) | |
380 | if self.profile_dir.copy_config_file(cfg, path=path, overwrite=False): |
|
380 | if self.profile_dir.copy_config_file(cfg, path=path, overwrite=False): | |
381 | # file was copied |
|
381 | # file was copied | |
382 | self.log.warn("Staging bundled %s from %s into %r"%( |
|
382 | self.log.warning("Staging bundled %s from %s into %r"%( | |
383 | cfg, self.profile, self.profile_dir.location) |
|
383 | cfg, self.profile, self.profile_dir.location) | |
384 | ) |
|
384 | ) | |
385 |
|
385 | |||
@@ -389,7 +389,7 b' class BaseIPythonApplication(Application):' | |||||
389 | s = self.generate_config_file() |
|
389 | s = self.generate_config_file() | |
390 | fname = os.path.join(self.profile_dir.location, self.config_file_name) |
|
390 | fname = os.path.join(self.profile_dir.location, self.config_file_name) | |
391 | if self.overwrite or not os.path.exists(fname): |
|
391 | if self.overwrite or not os.path.exists(fname): | |
392 | self.log.warn("Generating default config file: %r"%(fname)) |
|
392 | self.log.warning("Generating default config file: %r"%(fname)) | |
393 | with open(fname, 'w') as f: |
|
393 | with open(fname, 'w') as f: | |
394 | f.write(s) |
|
394 | f.write(s) | |
395 |
|
395 | |||
@@ -407,4 +407,3 b' class BaseIPythonApplication(Application):' | |||||
407 | self.load_config_file() |
|
407 | self.load_config_file() | |
408 | # enforce cl-opts override configfile opts: |
|
408 | # enforce cl-opts override configfile opts: | |
409 | self.update_config(cl_config) |
|
409 | self.update_config(cl_config) | |
410 |
|
General Comments 0
You need to be logged in to leave comments.
Login now