##// END OF EJS Templates
Merge pull request #13903 from Carreau/log-f...
Matthias Bussonnier -
r28055:1d559a22 merge
parent child Browse files
Show More
@@ -310,7 +310,7 b' class BaseIPythonApplication(Application):'
310 except OSError as e:
310 except OSError as e:
311 # this will not be EEXIST
311 # this will not be EEXIST
312 self.log.error("couldn't create path %s: %s", path, e)
312 self.log.error("couldn't create path %s: %s", path, e)
313 self.log.debug("IPYTHONDIR set to: %s" % new)
313 self.log.debug("IPYTHONDIR set to: %s", new)
314
314
315 def load_config_file(self, suppress_errors=IPYTHON_SUPPRESS_CONFIG_ERRORS):
315 def load_config_file(self, suppress_errors=IPYTHON_SUPPRESS_CONFIG_ERRORS):
316 """Load the config file.
316 """Load the config file.
@@ -400,7 +400,7 b' class BaseIPythonApplication(Application):'
400 self.log.fatal("Profile %r not found."%self.profile)
400 self.log.fatal("Profile %r not found."%self.profile)
401 self.exit(1)
401 self.exit(1)
402 else:
402 else:
403 self.log.debug(f"Using existing profile dir: {p.location!r}")
403 self.log.debug("Using existing profile dir: %r", p.location)
404 else:
404 else:
405 location = self.config.ProfileDir.location
405 location = self.config.ProfileDir.location
406 # location is fully specified
406 # location is fully specified
@@ -420,7 +420,7 b' class BaseIPythonApplication(Application):'
420 self.log.fatal("Profile directory %r not found."%location)
420 self.log.fatal("Profile directory %r not found."%location)
421 self.exit(1)
421 self.exit(1)
422 else:
422 else:
423 self.log.debug(f"Using existing profile dir: {p.location!r}")
423 self.log.debug("Using existing profile dir: %r", p.location)
424 # if profile_dir is specified explicitly, set profile name
424 # if profile_dir is specified explicitly, set profile name
425 dir_name = os.path.basename(p.location)
425 dir_name = os.path.basename(p.location)
426 if dir_name.startswith('profile_'):
426 if dir_name.startswith('profile_'):
@@ -467,7 +467,7 b' class BaseIPythonApplication(Application):'
467 s = self.generate_config_file()
467 s = self.generate_config_file()
468 config_file = Path(self.profile_dir.location) / self.config_file_name
468 config_file = Path(self.profile_dir.location) / self.config_file_name
469 if self.overwrite or not config_file.exists():
469 if self.overwrite or not config_file.exists():
470 self.log.warning("Generating default config file: %r" % (config_file))
470 self.log.warning("Generating default config file: %r", (config_file))
471 config_file.write_text(s, encoding="utf-8")
471 config_file.write_text(s, encoding="utf-8")
472
472
473 @catch_config_error
473 @catch_config_error
@@ -278,7 +278,7 b' class InteractiveShellApp(Configurable):'
278 )
278 )
279 for ext in extensions:
279 for ext in extensions:
280 try:
280 try:
281 self.log.info("Loading IPython extension: %s" % ext)
281 self.log.info("Loading IPython extension: %s", ext)
282 self.shell.extension_manager.load_extension(ext)
282 self.shell.extension_manager.load_extension(ext)
283 except:
283 except:
284 if self.reraise_ipython_extension_failures:
284 if self.reraise_ipython_extension_failures:
General Comments 0
You need to be logged in to leave comments. Login now