##// END OF EJS Templates
don't merge App.extra_extension into App.extensions...
Min RK -
Show More
@@ -2,23 +2,10 b''
2 2 """
3 3 A mixin for :class:`~IPython.core.application.Application` classes that
4 4 launch InteractiveShell instances, load extensions, etc.
5
6 Authors
7 -------
8
9 * Min Ragan-Kelley
10 5 """
11 6
12 #-----------------------------------------------------------------------------
13 # Copyright (C) 2008-2011 The IPython Development Team
14 #
15 # Distributed under the terms of the BSD License. The full license is in
16 # the file COPYING, distributed as part of this software.
17 #-----------------------------------------------------------------------------
18
19 #-----------------------------------------------------------------------------
20 # Imports
21 #-----------------------------------------------------------------------------
7 # Copyright (c) IPython Development Team.
8 # Distributed under the terms of the Modified BSD License.
22 9
23 10 from __future__ import absolute_import
24 11 from __future__ import print_function
@@ -152,10 +139,6 b' class InteractiveShellApp(Configurable):'
152 139 extra_extension = Unicode('', config=True,
153 140 help="dotted module name of an IPython extension to load."
154 141 )
155 def _extra_extension_changed(self, name, old, new):
156 if new:
157 # add to self.extensions
158 self.extensions.append(new)
159 142
160 143 # Extensions that are always loaded (not configurable)
161 144 default_extensions = List(Unicode, [u'storemagic'], config=False)
@@ -269,6 +252,8 b' class InteractiveShellApp(Configurable):'
269 252 try:
270 253 self.log.debug("Loading IPython extensions...")
271 254 extensions = self.default_extensions + self.extensions
255 if self.extra_extension:
256 extensions.append(self.extra_extension)
272 257 for ext in extensions:
273 258 try:
274 259 self.log.info("Loading IPython extension: %s" % ext)
General Comments 0
You need to be logged in to leave comments. Login now