Show More
@@ -10,12 +10,7 b'' | |||
|
10 | 10 | # the file COPYING, distributed as part of this software. |
|
11 | 11 | #----------------------------------------------------------------------------- |
|
12 | 12 | |
|
13 | #----------------------------------------------------------------------------- | |
|
14 | # Imports | |
|
15 | #----------------------------------------------------------------------------- | |
|
16 | ||
|
17 | from __future__ import absolute_import | |
|
18 | from __future__ import print_function | |
|
13 | from __future__ import absolute_import, print_function | |
|
19 | 14 | |
|
20 | 15 | import __future__ |
|
21 | 16 | import abc |
@@ -453,7 +448,6 b' class InteractiveShell(SingletonConfigurable):' | |||
|
453 | 448 | self.init_profile_dir(profile_dir) |
|
454 | 449 | self.init_instance_attrs() |
|
455 | 450 | self.init_environment() |
|
456 | self.compute_banner() | |
|
457 | 451 | |
|
458 | 452 | # Check if we're in a virtualenv, and set up sys.path. |
|
459 | 453 | self.init_virtualenv() |
@@ -788,18 +782,14 b' class InteractiveShell(SingletonConfigurable):' | |||
|
788 | 782 | # Things related to the banner |
|
789 | 783 | #------------------------------------------------------------------------- |
|
790 | 784 | |
|
791 | def _banner1_changed(self): | |
|
792 | self.compute_banner() | |
|
793 | ||
|
794 | def _banner2_changed(self): | |
|
795 | self.compute_banner() | |
|
796 | ||
|
797 | def compute_banner(self): | |
|
798 | self.banner = self.banner1 | |
|
785 | @property | |
|
786 | def banner(self): | |
|
787 | banner = self.banner1 | |
|
799 | 788 | if self.profile and self.profile != 'default': |
|
800 |
|
|
|
789 | banner += '\nIPython profile: %s\n' % self.profile | |
|
801 | 790 | if self.banner2: |
|
802 |
|
|
|
791 | banner += '\n' + self.banner2 | |
|
792 | return banner | |
|
803 | 793 | |
|
804 | 794 | def show_banner(self, banner=None): |
|
805 | 795 | if banner is None: |
General Comments 0
You need to be logged in to leave comments.
Login now