##// END OF EJS Templates
Merge pull request #2102 from RuiPereira/fixlog...
Fernando Perez -
r7820:56d2be52 merge
parent child Browse files
Show More
@@ -469,11 +469,6 b' class InteractiveShell(SingletonConfigurable):'
469 self.init_alias()
469 self.init_alias()
470 self.init_builtins()
470 self.init_builtins()
471
471
472 # pre_config_initialization
473
474 # The next section should contain everything that was in ipmaker.
475 self.init_logstart()
476
477 # The following was in post_config_initialization
472 # The following was in post_config_initialization
478 self.init_inspector()
473 self.init_inspector()
479 # init_readline() must come before init_io(), because init_io uses
474 # init_readline() must come before init_io(), because init_io uses
@@ -502,6 +497,7 b' class InteractiveShell(SingletonConfigurable):'
502 self.init_displayhook()
497 self.init_displayhook()
503 self.init_reload_doctest()
498 self.init_reload_doctest()
504 self.init_magics()
499 self.init_magics()
500 self.init_logstart()
505 self.init_pdb()
501 self.init_pdb()
506 self.init_extension_manager()
502 self.init_extension_manager()
507 self.init_plugin_manager()
503 self.init_plugin_manager()
@@ -617,7 +613,7 b' class InteractiveShell(SingletonConfigurable):'
617 if self.logappend:
613 if self.logappend:
618 self.magic('logstart %s append' % self.logappend)
614 self.magic('logstart %s append' % self.logappend)
619 elif self.logfile:
615 elif self.logfile:
620 self.magic('logstart %' % self.logfile)
616 self.magic('logstart %s' % self.logfile)
621 elif self.logstart:
617 elif self.logstart:
622 self.magic('logstart')
618 self.magic('logstart')
623
619
General Comments 0
You need to be logged in to leave comments. Login now