diff --git a/IPython/core/application.py b/IPython/core/application.py
index fc600d2..84cbb69 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -12,6 +12,7 @@ Authors:
* Brian Granger
* Fernando Perez
+* Min RK
Notes
-----
@@ -30,439 +31,399 @@ Notes
import logging
import os
+import shutil
import sys
+from IPython.config.application import Application
+from IPython.config.configurable import Configurable
+from IPython.config.loader import Config
from IPython.core import release, crashhandler
-from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
-from IPython.config.loader import (
- PyFileConfigLoader,
- ArgParseConfigLoader,
- Config,
-)
+from IPython.utils.path import get_ipython_dir, get_ipython_package_dir, expand_path
+from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict
#-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
-class ApplicationError(Exception):
+
+#-----------------------------------------------------------------------------
+# Module errors
+#-----------------------------------------------------------------------------
+
+class ProfileDirError(Exception):
pass
-class BaseAppConfigLoader(ArgParseConfigLoader):
- """Default command line options for IPython based applications."""
-
- def _add_ipython_dir(self, parser):
- """Add the --ipython-dir option to the parser."""
- paa = parser.add_argument
- paa('--ipython-dir',
- dest='Global.ipython_dir',type=unicode,
- help=
- """Set to override default location of the IPython directory
- IPYTHON_DIR, stored as Global.ipython_dir. This can also be
- specified through the environment variable IPYTHON_DIR.""",
- metavar='Global.ipython_dir')
-
- def _add_log_level(self, parser):
- """Add the --log-level option to the parser."""
- paa = parser.add_argument
- paa('--log-level',
- dest="Global.log_level",type=int,
- help='Set the log level (0,10,20,30,40,50). Default is 30.',
- metavar='Global.log_level')
-
- def _add_version(self, parser):
- """Add the --version option to the parser."""
- parser.add_argument('--version', action="version",
- version=self.version)
-
- def _add_arguments(self):
- self._add_ipython_dir(self.parser)
- self._add_log_level(self.parser)
- try: # Old versions of argparse don't have a version action
- self._add_version(self.parser)
- except Exception:
- pass
-
-
-class Application(object):
- """Load a config, construct configurables and set them running.
-
- The configuration of an application can be done via three different Config
- objects, which are loaded and ultimately merged into a single one used
- from that point on by the app. These are:
-
- 1. default_config: internal defaults, implemented in code.
- 2. file_config: read from the filesystem.
- 3. command_line_config: read from the system's command line flags.
-
- During initialization, 3 is actually read before 2, since at the
- command-line one may override the location of the file to be read. But the
- above is the order in which the merge is made.
- """
+#-----------------------------------------------------------------------------
+# Class for managing profile directories
+#-----------------------------------------------------------------------------
- name = u'ipython'
- description = 'IPython: an enhanced interactive Python shell.'
- #: Usage message printed by argparse. If None, auto-generate
- usage = None
- #: The command line config loader. Subclass of ArgParseConfigLoader.
- command_line_loader = BaseAppConfigLoader
- #: The name of the config file to load, determined at runtime
- config_file_name = None
- #: The name of the default config file. Track separately from the actual
- #: name because some logic happens only if we aren't using the default.
- default_config_file_name = u'ipython_config.py'
- default_log_level = logging.WARN
- #: Set by --profile option
- profile_name = None
- #: User's ipython directory, typically ~/.ipython or ~/.config/ipython/
- ipython_dir = None
- #: Internal defaults, implemented in code.
- default_config = None
- #: Read from the filesystem.
- file_config = None
- #: Read from the system's command line flags.
- command_line_config = None
- #: The final config that will be passed to the main object.
- master_config = None
- #: A reference to the argv to be used (typically ends up being sys.argv[1:])
- argv = None
- #: extra arguments computed by the command-line loader
- extra_args = None
- #: The class to use as the crash handler.
- crash_handler_class = crashhandler.CrashHandler
-
- # Private attributes
- _exiting = False
- _initialized = False
-
- def __init__(self, argv=None):
- self.argv = sys.argv[1:] if argv is None else argv
- self.init_logger()
-
- def init_logger(self):
- self.log = logging.getLogger(self.__class__.__name__)
- # This is used as the default until the command line arguments are read.
- self.log.setLevel(self.default_log_level)
- self._log_handler = logging.StreamHandler()
- self._log_formatter = logging.Formatter("[%(name)s] %(message)s")
- self._log_handler.setFormatter(self._log_formatter)
- self.log.addHandler(self._log_handler)
-
- def _set_log_level(self, level):
- self.log.setLevel(level)
-
- def _get_log_level(self):
- return self.log.level
-
- log_level = property(_get_log_level, _set_log_level)
-
- def initialize(self):
- """Initialize the application.
-
- Loads all configuration information and sets all application state, but
- does not start any relevant processing (typically some kind of event
- loop).
-
- Once this method has been called, the application is flagged as
- initialized and the method becomes a no-op."""
-
- if self._initialized:
- return
+class ProfileDir(Configurable):
+ """An object to manage the profile directory and its resources.
- # The first part is protected with an 'attempt' wrapper, that will log
- # failures with the basic system traceback machinery. Once our crash
- # handler is in place, we can let any subsequent exception propagate,
- # as our handler will log it with much better detail than the default.
- self.attempt(self.create_crash_handler)
-
- # Configuration phase
- # Default config (internally hardwired in application code)
- self.create_default_config()
- self.log_default_config()
- self.set_default_config_log_level()
-
- # Command-line config
- self.pre_load_command_line_config()
- self.load_command_line_config()
- self.set_command_line_config_log_level()
- self.post_load_command_line_config()
- self.log_command_line_config()
-
- # Find resources needed for filesystem access, using information from
- # the above two
- self.find_ipython_dir()
- self.find_resources()
- self.find_config_file_name()
- self.find_config_file_paths()
-
- # File-based config
- self.pre_load_file_config()
- self.load_file_config()
- self.set_file_config_log_level()
- self.post_load_file_config()
- self.log_file_config()
-
- # Merge all config objects into a single one the app can then use
- self.merge_configs()
- self.log_master_config()
-
- # Construction phase
- self.pre_construct()
- self.construct()
- self.post_construct()
-
- # Done, flag as such and
- self._initialized = True
-
- def start(self):
- """Start the application."""
- self.initialize()
- self.start_app()
+ The profile directory is used by all IPython applications, to manage
+ configuration, logging and security.
- #-------------------------------------------------------------------------
- # Various stages of Application creation
- #-------------------------------------------------------------------------
+ This object knows how to find, create and manage these directories. This
+ should be used by any code that wants to handle profiles.
+ """
- def create_crash_handler(self):
- """Create a crash handler, typically setting sys.excepthook to it."""
- self.crash_handler = self.crash_handler_class(self)
- sys.excepthook = self.crash_handler
+ security_dir_name = Unicode('security')
+ log_dir_name = Unicode('log')
+ pid_dir_name = Unicode('pid')
+ security_dir = Unicode(u'')
+ log_dir = Unicode(u'')
+ pid_dir = Unicode(u'')
+
+ location = Unicode(u'', config=True,
+ help="""Set the profile location directly. This overrides the logic used by the
+ `profile` option.""",
+ )
- def create_default_config(self):
- """Create defaults that can't be set elsewhere.
+ _location_isset = Bool(False) # flag for detecting multiply set location
- For the most part, we try to set default in the class attributes
- of Configurables. But, defaults the top-level Application (which is
- not a HasTraits or Configurables) are not set in this way. Instead
- we set them here. The Global section is for variables like this that
- don't belong to a particular configurable.
- """
- c = Config()
- c.Global.ipython_dir = get_ipython_dir()
- c.Global.log_level = self.log_level
- self.default_config = c
+ def _location_changed(self, name, old, new):
+ if self._location_isset:
+ raise RuntimeError("Cannot set profile location more than once.")
+ self._location_isset = True
+ if not os.path.isdir(new):
+ os.makedirs(new)
+
+ # ensure config files exist:
+ self.security_dir = os.path.join(new, self.security_dir_name)
+ self.log_dir = os.path.join(new, self.log_dir_name)
+ self.pid_dir = os.path.join(new, self.pid_dir_name)
+ self.check_dirs()
- def log_default_config(self):
- self.log.debug('Default config loaded:')
- self.log.debug(repr(self.default_config))
+ def _log_dir_changed(self, name, old, new):
+ self.check_log_dir()
- def set_default_config_log_level(self):
- try:
- self.log_level = self.default_config.Global.log_level
- except AttributeError:
- # Fallback to the default_log_level class attribute
- pass
-
- def create_command_line_config(self):
- """Create and return a command line config loader."""
- return self.command_line_loader(
- self.argv,
- description=self.description,
- version=release.version,
- usage=self.usage
- )
+ def check_log_dir(self):
+ if not os.path.isdir(self.log_dir):
+ os.mkdir(self.log_dir)
- def pre_load_command_line_config(self):
- """Do actions just before loading the command line config."""
- pass
+ def _security_dir_changed(self, name, old, new):
+ self.check_security_dir()
- def load_command_line_config(self):
- """Load the command line config."""
- loader = self.create_command_line_config()
- self.command_line_config = loader.load_config()
- self.extra_args = loader.get_extra_args()
+ def check_security_dir(self):
+ if not os.path.isdir(self.security_dir):
+ os.mkdir(self.security_dir, 0700)
+ else:
+ os.chmod(self.security_dir, 0700)
- def set_command_line_config_log_level(self):
- try:
- self.log_level = self.command_line_config.Global.log_level
- except AttributeError:
- pass
+ def _pid_dir_changed(self, name, old, new):
+ self.check_pid_dir()
- def post_load_command_line_config(self):
- """Do actions just after loading the command line config."""
- pass
+ def check_pid_dir(self):
+ if not os.path.isdir(self.pid_dir):
+ os.mkdir(self.pid_dir, 0700)
+ else:
+ os.chmod(self.pid_dir, 0700)
- def log_command_line_config(self):
- self.log.debug("Command line config loaded:")
- self.log.debug(repr(self.command_line_config))
+ def check_dirs(self):
+ self.check_security_dir()
+ self.check_log_dir()
+ self.check_pid_dir()
- def find_ipython_dir(self):
- """Set the IPython directory.
+ def copy_config_file(self, config_file, path=None, overwrite=False):
+ """Copy a default config file into the active profile directory.
- This sets ``self.ipython_dir``, but the actual value that is passed to
- the application is kept in either ``self.default_config`` or
- ``self.command_line_config``. This also adds ``self.ipython_dir`` to
- ``sys.path`` so config files there can be referenced by other config
- files.
+ Default configuration files are kept in :mod:`IPython.config.default`.
+ This function moves these from that location to the working profile
+ directory.
"""
-
- try:
- self.ipython_dir = self.command_line_config.Global.ipython_dir
- except AttributeError:
- self.ipython_dir = self.default_config.Global.ipython_dir
- sys.path.append(os.path.abspath(self.ipython_dir))
- if not os.path.isdir(self.ipython_dir):
- os.makedirs(self.ipython_dir, mode=0777)
- self.log.debug("IPYTHON_DIR set to: %s" % self.ipython_dir)
-
- def find_resources(self):
- """Find other resources that need to be in place.
-
- Things like cluster directories need to be in place to find the
- config file. These happen right after the IPython directory has
- been set.
+ dst = os.path.join(self.location, config_file)
+ if os.path.isfile(dst) and not overwrite:
+ return
+ if path is None:
+ path = os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
+ src = os.path.join(path, config_file)
+ shutil.copy(src, dst)
+
+ @classmethod
+ def create_profile_dir(cls, profile_dir, config=None):
+ """Create a new profile directory given a full path.
+
+ Parameters
+ ----------
+ profile_dir : str
+ The full path to the profile directory. If it does exist, it will
+ be used. If not, it will be created.
+ """
+ return cls(location=profile_dir, config=config)
+
+ @classmethod
+ def create_profile_dir_by_name(cls, path, name=u'default', config=None):
+ """Create a profile dir by profile name and path.
+
+ Parameters
+ ----------
+ path : unicode
+ The path (directory) to put the profile directory in.
+ name : unicode
+ The name of the profile. The name of the profile directory will
+ be "profile_<profile>".
"""
- pass
+ if not os.path.isdir(path):
+ raise ProfileDirError('Directory not found: %s' % path)
+ profile_dir = os.path.join(path, u'profile_' + name)
+ return cls(location=profile_dir, config=config)
+
+ @classmethod
+ def find_profile_dir_by_name(cls, ipython_dir, name=u'default', config=None):
+ """Find an existing profile dir by profile name, return its ProfileDir.
+
+ This searches through a sequence of paths for a profile dir. If it
+ is not found, a :class:`ProfileDirError` exception will be raised.
+
+ The search path algorithm is:
+ 1. ``os.getcwd()``
+ 2. ``ipython_dir``
+
+ Parameters
+ ----------
+ ipython_dir : unicode or str
+ The IPython directory to use.
+ name : unicode or str
+ The name of the profile. The name of the profile directory
+ will be "profile_<profile>".
+ """
+ dirname = u'profile_' + name
+ paths = [os.getcwdu(), ipython_dir]
+ for p in paths:
+ profile_dir = os.path.join(p, dirname)
+ if os.path.isdir(profile_dir):
+ return cls(location=profile_dir, config=config)
+ else:
+ raise ProfileDirError('Profile directory not found in paths: %s' % dirname)
- def find_config_file_name(self):
- """Find the config file name for this application.
+ @classmethod
+ def find_profile_dir(cls, profile_dir, config=None):
+ """Find/create a profile dir and return its ProfileDir.
- This must set ``self.config_file_name`` to the filename of the
- config file to use (just the filename). The search paths for the
- config file are set in :meth:`find_config_file_paths` and then passed
- to the config file loader where they are resolved to an absolute path.
+ This will create the profile directory if it doesn't exist.
- If a profile has been set at the command line, this will resolve it.
+ Parameters
+ ----------
+ profile_dir : unicode or str
+ The path of the profile directory. This is expanded using
+ :func:`IPython.utils.genutils.expand_path`.
"""
- try:
- self.config_file_name = self.command_line_config.Global.config_file
- except AttributeError:
- pass
- else:
- return
+ profile_dir = expand_path(profile_dir)
+ if not os.path.isdir(profile_dir):
+ raise ProfileDirError('Profile directory not found: %s' % profile_dir)
+ return cls(location=profile_dir, config=config)
- try:
- self.profile_name = self.command_line_config.Global.profile
- except AttributeError:
- # Just use the default as there is no profile
- self.config_file_name = self.default_config_file_name
- else:
- # Use the default config file name and profile name if set
- # to determine the used config file name.
- name_parts = self.default_config_file_name.split('.')
- name_parts.insert(1, u'_' + self.profile_name + u'.')
- self.config_file_name = ''.join(name_parts)
- def find_config_file_paths(self):
- """Set the search paths for resolving the config file.
+#-----------------------------------------------------------------------------
+# Base Application Class
+#-----------------------------------------------------------------------------
+
+# aliases and flags
+
+base_aliases = dict(
+ profile='BaseIPythonApplication.profile',
+ ipython_dir='BaseIPythonApplication.ipython_dir',
+)
- This must set ``self.config_file_paths`` to a sequence of search
- paths to pass to the config file loader.
+base_flags = dict(
+ debug = ({'Application' : {'log_level' : logging.DEBUG}},
+ "set log level to logging.DEBUG (maximize logging output)"),
+ quiet = ({'Application' : {'log_level' : logging.CRITICAL}},
+ "set log level to logging.CRITICAL (minimize logging output)"),
+ init = ({'BaseIPythonApplication' : {
+ 'copy_config_files' : True,
+ 'auto_create' : True}
+ }, "Initialize profile with default config files")
+)
+
+
+class BaseIPythonApplication(Application):
+
+ name = Unicode(u'ipython')
+ description = Unicode(u'IPython: an enhanced interactive Python shell.')
+ version = Unicode(release.version)
+
+ aliases = Dict(base_aliases)
+ flags = Dict(base_flags)
+
+ # Track whether the config_file has changed,
+ # because some logic happens only if we aren't using the default.
+ config_file_specified = Bool(False)
+
+ config_file_name = Unicode(u'ipython_config.py')
+ def _config_file_name_changed(self, name, old, new):
+ if new != old:
+ self.config_file_specified = True
+
+ # The directory that contains IPython's builtin profiles.
+ builtin_profile_dir = Unicode(
+ os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
+ )
+
+ config_file_paths = List(Unicode)
+ def _config_file_paths_default(self):
+ return [os.getcwdu()]
+
+ profile = Unicode(u'default', config=True,
+ help="""The IPython profile to use."""
+ )
+ def _profile_changed(self, name, old, new):
+ self.builtin_profile_dir = os.path.join(
+ get_ipython_package_dir(), u'config', u'profile', new
+ )
+
+
+ ipython_dir = Unicode(get_ipython_dir(), config=True,
+ help="""
+ The name of the IPython directory. This directory is used for logging
+ configuration (through profiles), history storage, etc. The default
+ is usually $HOME/.ipython. This options can also be specified through
+ the environment variable IPYTHON_DIR.
"""
- # Include our own profiles directory last, so that users can still find
- # our shipped copies of builtin profiles even if they don't have them
- # in their local ipython directory.
- prof_dir = os.path.join(get_ipython_package_dir(), 'config', 'profile')
- self.config_file_paths = (os.getcwdu(), self.ipython_dir, prof_dir)
+ )
+
+ overwrite = Bool(False, config=True,
+ help="""Whether to overwrite existing config files when copying""")
+ auto_create = Bool(False, config=True,
+ help="""Whether to create profile dir if it doesn't exist""")
+
+ config_files = List(Unicode)
+ def _config_files_default(self):
+ return [u'ipython_config.py']
+
+ copy_config_files = Bool(False, config=True,
+ help="""Whether to copy the default config files into the profile dir.""")
+
+ # The class to use as the crash handler.
+ crash_handler_class = Type(crashhandler.CrashHandler)
+
+ def __init__(self, **kwargs):
+ super(BaseIPythonApplication, self).__init__(**kwargs)
+ # ensure even default IPYTHON_DIR exists
+ if not os.path.exists(self.ipython_dir):
+ self._ipython_dir_changed('ipython_dir', self.ipython_dir, self.ipython_dir)
+
+ #-------------------------------------------------------------------------
+ # Various stages of Application creation
+ #-------------------------------------------------------------------------
- def pre_load_file_config(self):
- """Do actions before the config file is loaded."""
- pass
+ def init_crash_handler(self):
+ """Create a crash handler, typically setting sys.excepthook to it."""
+ self.crash_handler = self.crash_handler_class(self)
+ sys.excepthook = self.crash_handler
- def load_file_config(self, suppress_errors=True):
+ def _ipython_dir_changed(self, name, old, new):
+ if old in sys.path:
+ sys.path.remove(old)
+ sys.path.append(os.path.abspath(new))
+ if not os.path.isdir(new):
+ os.makedirs(new, mode=0777)
+ readme = os.path.join(new, 'README')
+ if not os.path.exists(readme):
+ path = os.path.join(get_ipython_package_dir(), u'config', u'profile')
+ shutil.copy(os.path.join(path, 'README'), readme)
+ self.log.debug("IPYTHON_DIR set to: %s" % new)
+
+ def load_config_file(self, suppress_errors=True):
"""Load the config file.
-
- This tries to load the config file from disk. If successful, the
- ``CONFIG_FILE`` config variable is set to the resolved config file
- location. If not successful, an empty config is used.
-
+
By default, errors in loading config are handled, and a warning
printed on screen. For testing, the suppress_errors option is set
to False, so errors will make tests fail.
"""
self.log.debug("Attempting to load config file: %s" %
self.config_file_name)
- loader = PyFileConfigLoader(self.config_file_name,
- path=self.config_file_paths)
try:
- self.file_config = loader.load_config()
- self.file_config.Global.config_file = loader.full_filename
+ Application.load_config_file(
+ self,
+ self.config_file_name,
+ path=self.config_file_paths
+ )
except IOError:
# Only warn if the default config file was NOT being used.
- if not self.config_file_name==self.default_config_file_name:
+ if self.config_file_specified:
self.log.warn("Config file not found, skipping: %s" %
- self.config_file_name, exc_info=True)
- self.file_config = Config()
+ self.config_file_name)
except:
- if not suppress_errors: # For testing purposes
+ # For testing purposes.
+ if not suppress_errors:
raise
self.log.warn("Error loading config file: %s" %
self.config_file_name, exc_info=True)
- self.file_config = Config()
- def set_file_config_log_level(self):
- # We need to keeep self.log_level updated. But we only use the value
- # of the file_config if a value was not specified at the command
- # line, because the command line overrides everything.
- if not hasattr(self.command_line_config.Global, 'log_level'):
+ def init_profile_dir(self):
+ """initialize the profile dir"""
+ try:
+ # location explicitly specified:
+ location = self.config.ProfileDir.location
+ except AttributeError:
+ # location not specified, find by profile name
try:
- self.log_level = self.file_config.Global.log_level
- except AttributeError:
- pass # Use existing value
-
- def post_load_file_config(self):
- """Do actions after the config file is loaded."""
- pass
-
- def log_file_config(self):
- if hasattr(self.file_config.Global, 'config_file'):
- self.log.debug("Config file loaded: %s" %
- self.file_config.Global.config_file)
- self.log.debug(repr(self.file_config))
-
- def merge_configs(self):
- """Merge the default, command line and file config objects."""
- config = Config()
- config._merge(self.default_config)
- config._merge(self.file_config)
- config._merge(self.command_line_config)
-
- # XXX fperez - propose to Brian we rename master_config to simply
- # config, I think this is going to be heavily used in examples and
- # application code and the name is shorter/easier to find/remember.
- # For now, just alias it...
- self.master_config = config
- self.config = config
-
- def log_master_config(self):
- self.log.debug("Master config created:")
- self.log.debug(repr(self.master_config))
-
- def pre_construct(self):
- """Do actions after the config has been built, but before construct."""
- pass
-
- def construct(self):
- """Construct the main objects that make up this app."""
- self.log.debug("Constructing main objects for application")
-
- def post_construct(self):
- """Do actions after construct, but before starting the app."""
- pass
-
- def start_app(self):
- """Actually start the app."""
- self.log.debug("Starting application")
-
- #-------------------------------------------------------------------------
- # Utility methods
- #-------------------------------------------------------------------------
-
- def exit(self, exit_status=0):
- if self._exiting:
- pass
+ p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
+ except ProfileDirError:
+ # not found, maybe create it (always create default profile)
+ if self.auto_create or self.profile=='default':
+ try:
+ p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
+ except ProfileDirError:
+ self.log.fatal("Could not create profile: %r"%self.profile)
+ self.exit(1)
+ else:
+ self.log.info("Created profile dir: %r"%p.location)
+ else:
+ self.log.fatal("Profile %r not found."%self.profile)
+ self.exit(1)
+ else:
+ self.log.info("Using existing profile dir: %r"%p.location)
else:
- self.log.debug("Exiting application: %s" % self.name)
- self._exiting = True
- sys.exit(exit_status)
-
- def attempt(self, func):
- try:
- func()
- except SystemExit:
- raise
- except:
- self.log.critical("Aborting application: %s" % self.name,
- exc_info=True)
- self.exit(0)
+ # location is fully specified
+ try:
+ p = ProfileDir.find_profile_dir(location, self.config)
+ except ProfileDirError:
+ # not found, maybe create it
+ if self.auto_create:
+ try:
+ p = ProfileDir.create_profile_dir(location, self.config)
+ except ProfileDirError:
+ self.log.fatal("Could not create profile directory: %r"%location)
+ self.exit(1)
+ else:
+ self.log.info("Creating new profile dir: %r"%location)
+ else:
+ self.log.fatal("Profile directory %r not found."%location)
+ self.exit(1)
+ else:
+ self.log.info("Using existing profile dir: %r"%location)
+
+ self.profile_dir = p
+ self.config_file_paths.append(p.location)
+
+ def init_config_files(self):
+ """[optionally] copy default config files into profile dir."""
+ # copy config files
+ if self.copy_config_files:
+ path = self.builtin_profile_dir
+ src = self.profile
+ if not os.path.exists(path):
+ # use default if new profile doesn't have a preset
+ path = None
+ src = 'default'
+
+ self.log.debug("Staging %s config files into %r [overwrite=%s]"%(
+ src, self.profile_dir.location, self.overwrite)
+ )
+
+ for cfg in self.config_files:
+ self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite)
+
+ def initialize(self, argv=None):
+ self.init_crash_handler()
+ self.parse_command_line(argv)
+ cl_config = self.config
+ self.init_profile_dir()
+ self.init_config_files()
+ self.load_config_file()
+ # enforce cl-opts override configfile opts:
+ self.update_config(cl_config)
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7373068..fc3ae68 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -54,7 +54,7 @@ from IPython.core.inputsplitter import IPythonInputSplitter
from IPython.core.logger import Logger
from IPython.core.macro import Macro
from IPython.core.magic import Magic
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.core.payload import PayloadManager
from IPython.core.plugin import PluginManager
from IPython.core.prefilter import PrefilterManager, ESC_MAGIC
@@ -344,7 +344,7 @@ class InteractiveShell(SingletonConfigurable, Magic):
payload_manager = Instance('IPython.core.payload.PayloadManager')
history_manager = Instance('IPython.core.history.HistoryManager')
- profile_dir = Instance('IPython.core.newapplication.ProfileDir')
+ profile_dir = Instance('IPython.core.application.ProfileDir')
@property
def profile(self):
if self.profile_dir is not None:
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 3b55e00..a1292a7 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -46,7 +46,7 @@ from IPython.core import debugger, oinspect
from IPython.core.error import TryNext
from IPython.core.error import UsageError
from IPython.core.fakemodule import FakeModule
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.core.macro import Macro
from IPython.core import page
from IPython.core.prefilter import ESC_MAGIC
diff --git a/IPython/core/newapplication.py b/IPython/core/newapplication.py
deleted file mode 100644
index 4b736a4..0000000
--- a/IPython/core/newapplication.py
+++ /dev/null
@@ -1,436 +0,0 @@
-# encoding: utf-8
-"""
-An application for IPython.
-
-All top-level applications should use the classes in this module for
-handling configuration and creating componenets.
-
-The job of an :class:`Application` is to create the master configuration
-object and then create the configurable objects, passing the config to them.
-
-Authors:
-
-* Brian Granger
-* Fernando Perez
-* Min RK
-
-Notes
------
-"""
-
-#-----------------------------------------------------------------------------
-# Copyright (C) 2008-2009 The IPython Development Team
-#
-# Distributed under the terms of the BSD License. The full license is in
-# the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
-import logging
-import os
-import shutil
-import sys
-
-from IPython.config.application import Application
-from IPython.config.configurable import Configurable
-from IPython.config.loader import Config
-from IPython.core import release, crashhandler
-from IPython.utils.path import get_ipython_dir, get_ipython_package_dir, expand_path
-from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict
-
-#-----------------------------------------------------------------------------
-# Classes and functions
-#-----------------------------------------------------------------------------
-
-
-#-----------------------------------------------------------------------------
-# Module errors
-#-----------------------------------------------------------------------------
-
-class ProfileDirError(Exception):
- pass
-
-
-#-----------------------------------------------------------------------------
-# Class for managing profile directories
-#-----------------------------------------------------------------------------
-
-class ProfileDir(Configurable):
- """An object to manage the profile directory and its resources.
-
- The profile directory is used by all IPython applications, to manage
- configuration, logging and security.
-
- This object knows how to find, create and manage these directories. This
- should be used by any code that wants to handle profiles.
- """
-
- security_dir_name = Unicode('security')
- log_dir_name = Unicode('log')
- pid_dir_name = Unicode('pid')
- security_dir = Unicode(u'')
- log_dir = Unicode(u'')
- pid_dir = Unicode(u'')
-
- location = Unicode(u'', config=True,
- help="""Set the profile location directly. This overrides the logic used by the
- `profile` option.""",
- )
-
- _location_isset = Bool(False) # flag for detecting multiply set location
-
- def _location_changed(self, name, old, new):
- if self._location_isset:
- raise RuntimeError("Cannot set profile location more than once.")
- self._location_isset = True
- if not os.path.isdir(new):
- os.makedirs(new)
-
- # ensure config files exist:
- self.security_dir = os.path.join(new, self.security_dir_name)
- self.log_dir = os.path.join(new, self.log_dir_name)
- self.pid_dir = os.path.join(new, self.pid_dir_name)
- self.check_dirs()
-
- def _log_dir_changed(self, name, old, new):
- self.check_log_dir()
-
- def check_log_dir(self):
- if not os.path.isdir(self.log_dir):
- os.mkdir(self.log_dir)
-
- def _security_dir_changed(self, name, old, new):
- self.check_security_dir()
-
- def check_security_dir(self):
- if not os.path.isdir(self.security_dir):
- os.mkdir(self.security_dir, 0700)
- else:
- os.chmod(self.security_dir, 0700)
-
- def _pid_dir_changed(self, name, old, new):
- self.check_pid_dir()
-
- def check_pid_dir(self):
- if not os.path.isdir(self.pid_dir):
- os.mkdir(self.pid_dir, 0700)
- else:
- os.chmod(self.pid_dir, 0700)
-
- def check_dirs(self):
- self.check_security_dir()
- self.check_log_dir()
- self.check_pid_dir()
-
- def copy_config_file(self, config_file, path=None, overwrite=False):
- """Copy a default config file into the active profile directory.
-
- Default configuration files are kept in :mod:`IPython.config.default`.
- This function moves these from that location to the working profile
- directory.
- """
- dst = os.path.join(self.location, config_file)
- if os.path.isfile(dst) and not overwrite:
- return
- if path is None:
- path = os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
- src = os.path.join(path, config_file)
- shutil.copy(src, dst)
-
- @classmethod
- def create_profile_dir(cls, profile_dir, config=None):
- """Create a new profile directory given a full path.
-
- Parameters
- ----------
- profile_dir : str
- The full path to the profile directory. If it does exist, it will
- be used. If not, it will be created.
- """
- return cls(location=profile_dir, config=config)
-
- @classmethod
- def create_profile_dir_by_name(cls, path, name=u'default', config=None):
- """Create a profile dir by profile name and path.
-
- Parameters
- ----------
- path : unicode
- The path (directory) to put the profile directory in.
- name : unicode
- The name of the profile. The name of the profile directory will
- be "profile_<profile>".
- """
- if not os.path.isdir(path):
- raise ProfileDirError('Directory not found: %s' % path)
- profile_dir = os.path.join(path, u'profile_' + name)
- return cls(location=profile_dir, config=config)
-
- @classmethod
- def find_profile_dir_by_name(cls, ipython_dir, name=u'default', config=None):
- """Find an existing profile dir by profile name, return its ProfileDir.
-
- This searches through a sequence of paths for a profile dir. If it
- is not found, a :class:`ProfileDirError` exception will be raised.
-
- The search path algorithm is:
- 1. ``os.getcwd()``
- 2. ``ipython_dir``
- 3. The directories found in the ":" separated
- :env:`IPCLUSTER_DIR_PATH` environment variable.
-
- Parameters
- ----------
- ipython_dir : unicode or str
- The IPython directory to use.
- name : unicode or str
- The name of the profile. The name of the profile directory
- will be "profile_<profile>".
- """
- dirname = u'profile_' + name
- profile_dir_paths = os.environ.get('IPYTHON_PROFILE_PATH','')
- if profile_dir_paths:
- profile_dir_paths = profile_dir_paths.split(os.pathsep)
- else:
- profile_dir_paths = []
- paths = [os.getcwd(), ipython_dir] + profile_dir_paths
- for p in paths:
- profile_dir = os.path.join(p, dirname)
- if os.path.isdir(profile_dir):
- return cls(location=profile_dir, config=config)
- else:
- raise ProfileDirError('Profile directory not found in paths: %s' % dirname)
-
- @classmethod
- def find_profile_dir(cls, profile_dir, config=None):
- """Find/create a profile dir and return its ProfileDir.
-
- This will create the profile directory if it doesn't exist.
-
- Parameters
- ----------
- profile_dir : unicode or str
- The path of the profile directory. This is expanded using
- :func:`IPython.utils.genutils.expand_path`.
- """
- profile_dir = expand_path(profile_dir)
- if not os.path.isdir(profile_dir):
- raise ProfileDirError('Profile directory not found: %s' % profile_dir)
- return cls(location=profile_dir, config=config)
-
-
-#-----------------------------------------------------------------------------
-# Base Application Class
-#-----------------------------------------------------------------------------
-
-# aliases and flags
-
-base_aliases = dict(
- profile='BaseIPythonApplication.profile',
- ipython_dir='BaseIPythonApplication.ipython_dir',
-)
-
-base_flags = dict(
- debug = ({'Application' : {'log_level' : logging.DEBUG}},
- "set log level to logging.DEBUG (maximize logging output)"),
- quiet = ({'Application' : {'log_level' : logging.CRITICAL}},
- "set log level to logging.CRITICAL (minimize logging output)"),
- init = ({'BaseIPythonApplication' : {
- 'copy_config_files' : True,
- 'auto_create' : True}
- }, "Initialize profile with default config files")
-)
-
-
-class BaseIPythonApplication(Application):
-
- name = Unicode(u'ipython')
- description = Unicode(u'IPython: an enhanced interactive Python shell.')
- version = Unicode(release.version)
-
- aliases = Dict(base_aliases)
- flags = Dict(base_flags)
-
- # Track whether the config_file has changed,
- # because some logic happens only if we aren't using the default.
- config_file_specified = Bool(False)
-
- config_file_name = Unicode(u'ipython_config.py')
- def _config_file_name_changed(self, name, old, new):
- if new != old:
- self.config_file_specified = True
-
- # The directory that contains IPython's builtin profiles.
- builtin_profile_dir = Unicode(
- os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
- )
-
- config_file_paths = List(Unicode)
- def _config_file_paths_default(self):
- return [os.getcwdu()]
-
- profile = Unicode(u'default', config=True,
- help="""The IPython profile to use."""
- )
- def _profile_changed(self, name, old, new):
- self.builtin_profile_dir = os.path.join(
- get_ipython_package_dir(), u'config', u'profile', new
- )
-
-
- ipython_dir = Unicode(get_ipython_dir(), config=True,
- help="""
- The name of the IPython directory. This directory is used for logging
- configuration (through profiles), history storage, etc. The default
- is usually $HOME/.ipython. This options can also be specified through
- the environment variable IPYTHON_DIR.
- """
- )
-
- overwrite = Bool(False, config=True,
- help="""Whether to overwrite existing config files when copying""")
- auto_create = Bool(False, config=True,
- help="""Whether to create profile dir if it doesn't exist""")
-
- config_files = List(Unicode)
- def _config_files_default(self):
- return [u'ipython_config.py']
-
- copy_config_files = Bool(False, config=True,
- help="""Whether to copy the default config files into the profile dir.""")
-
- # The class to use as the crash handler.
- crash_handler_class = Type(crashhandler.CrashHandler)
-
- def __init__(self, **kwargs):
- super(BaseIPythonApplication, self).__init__(**kwargs)
- # ensure even default IPYTHON_DIR exists
- if not os.path.exists(self.ipython_dir):
- self._ipython_dir_changed('ipython_dir', self.ipython_dir, self.ipython_dir)
-
- #-------------------------------------------------------------------------
- # Various stages of Application creation
- #-------------------------------------------------------------------------
-
- def init_crash_handler(self):
- """Create a crash handler, typically setting sys.excepthook to it."""
- self.crash_handler = self.crash_handler_class(self)
- sys.excepthook = self.crash_handler
-
- def _ipython_dir_changed(self, name, old, new):
- if old in sys.path:
- sys.path.remove(old)
- sys.path.append(os.path.abspath(new))
- if not os.path.isdir(new):
- os.makedirs(new, mode=0777)
- readme = os.path.join(new, 'README')
- if not os.path.exists(readme):
- path = os.path.join(get_ipython_package_dir(), u'config', u'profile')
- shutil.copy(os.path.join(path, 'README'), readme)
- self.log.debug("IPYTHON_DIR set to: %s" % new)
-
- def load_config_file(self, suppress_errors=True):
- """Load the config file.
-
- By default, errors in loading config are handled, and a warning
- printed on screen. For testing, the suppress_errors option is set
- to False, so errors will make tests fail.
- """
- self.log.debug("Attempting to load config file: %s" %
- self.config_file_name)
- try:
- Application.load_config_file(
- self,
- self.config_file_name,
- path=self.config_file_paths
- )
- except IOError:
- # Only warn if the default config file was NOT being used.
- if self.config_file_specified:
- self.log.warn("Config file not found, skipping: %s" %
- self.config_file_name)
- except:
- # For testing purposes.
- if not suppress_errors:
- raise
- self.log.warn("Error loading config file: %s" %
- self.config_file_name, exc_info=True)
-
- def init_profile_dir(self):
- """initialize the profile dir"""
- try:
- # location explicitly specified:
- location = self.config.ProfileDir.location
- except AttributeError:
- # location not specified, find by profile name
- try:
- p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
- except ProfileDirError:
- # not found, maybe create it (always create default profile)
- if self.auto_create or self.profile=='default':
- try:
- p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
- except ProfileDirError:
- self.log.fatal("Could not create profile: %r"%self.profile)
- self.exit(1)
- else:
- self.log.info("Created profile dir: %r"%p.location)
- else:
- self.log.fatal("Profile %r not found."%self.profile)
- self.exit(1)
- else:
- self.log.info("Using existing profile dir: %r"%p.location)
- else:
- # location is fully specified
- try:
- p = ProfileDir.find_profile_dir(location, self.config)
- except ProfileDirError:
- # not found, maybe create it
- if self.auto_create:
- try:
- p = ProfileDir.create_profile_dir(location, self.config)
- except ProfileDirError:
- self.log.fatal("Could not create profile directory: %r"%location)
- self.exit(1)
- else:
- self.log.info("Creating new profile dir: %r"%location)
- else:
- self.log.fatal("Profile directory %r not found."%location)
- self.exit(1)
- else:
- self.log.info("Using existing profile dir: %r"%location)
-
- self.profile_dir = p
- self.config_file_paths.append(p.location)
-
- def init_config_files(self):
- """[optionally] copy default config files into profile dir."""
- # copy config files
- if self.copy_config_files:
- path = self.builtin_profile_dir
- src = self.profile
- if not os.path.exists(path):
- # use default if new profile doesn't have a preset
- path = None
- src = 'default'
-
- self.log.debug("Staging %s config files into %r [overwrite=%s]"%(
- src, self.profile_dir.location, self.overwrite)
- )
-
- for cfg in self.config_files:
- self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite)
-
- def initialize(self, argv=None):
- self.init_crash_handler()
- self.parse_command_line(argv)
- cl_config = self.config
- self.init_profile_dir()
- self.init_config_files()
- self.load_config_file()
- # enforce cl-opts override configfile opts:
- self.update_config(cl_config)
-
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index 803910f..aebf314 100755
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-A mixin for :class:`~IPython.core.newapplication.Application` classes that
+A mixin for :class:`~IPython.core.application.Application` classes that
launch InteractiveShell instances, load extensions, etc.
Authors
diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
index 3f337ed..8183fc9 100644
--- a/IPython/core/tests/test_application.py
+++ b/IPython/core/tests/test_application.py
@@ -4,7 +4,7 @@
import os
import tempfile
-from IPython.core.application import Application
+from IPython.core.application import BaseIPythonApplication
from IPython.testing import decorators as testdec
@testdec.onlyif_unicode_paths
@@ -16,22 +16,11 @@ def test_unicode_cwd():
os.chdir(wd)
#raise Exception(repr(os.getcwd()))
try:
- app = Application()
+ app = BaseIPythonApplication()
# The lines below are copied from Application.initialize()
- app.create_default_config()
- app.log_default_config()
- app.set_default_config_log_level()
-
- # Find resources needed for filesystem access, using information from
- # the above two
- app.find_ipython_dir()
- app.find_resources()
- app.find_config_file_name()
- app.find_config_file_paths()
-
- # File-based config
- app.pre_load_file_config()
- app.load_file_config(suppress_errors=False)
+ app.init_profile_dir()
+ app.init_config_files()
+ app.load_config_file(suppress_errors=False)
finally:
os.chdir(old_wd)
@@ -48,22 +37,11 @@ def test_unicode_ipdir():
old_ipdir2 = os.environ.pop("IPYTHON_DIR", None)
os.environ["IPYTHONDIR"] = ipdir.encode("utf-8")
try:
- app = Application()
+ app = BaseIPythonApplication()
# The lines below are copied from Application.initialize()
- app.create_default_config()
- app.log_default_config()
- app.set_default_config_log_level()
-
- # Find resources needed for filesystem access, using information from
- # the above two
- app.find_ipython_dir()
- app.find_resources()
- app.find_config_file_name()
- app.find_config_file_paths()
-
- # File-based config
- app.pre_load_file_config()
- app.load_file_config(suppress_errors=False)
+ app.init_profile_dir()
+ app.init_config_files()
+ app.load_config_file(suppress_errors=False)
finally:
if old_ipdir1:
os.environ["IPYTHONDIR"] = old_ipdir1
diff --git a/IPython/frontend/qt/console/qtconsoleapp.py b/IPython/frontend/qt/console/qtconsoleapp.py
index 8a567c2..3ca0850 100644
--- a/IPython/frontend/qt/console/qtconsoleapp.py
+++ b/IPython/frontend/qt/console/qtconsoleapp.py
@@ -27,7 +27,7 @@ from pygments.styles import get_all_styles
# Local imports
from IPython.config.application import boolean_flag
-from IPython.core.newapplication import ProfileDir, BaseIPythonApplication
+from IPython.core.application import ProfileDir, BaseIPythonApplication
from IPython.frontend.qt.console.frontend_widget import FrontendWidget
from IPython.frontend.qt.console.ipython_widget import IPythonWidget
from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py
index 505efaf..45099aa 100755
--- a/IPython/frontend/terminal/ipapp.py
+++ b/IPython/frontend/terminal/ipapp.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-The :class:`~IPython.core.newapplication.Application` object for the command
+The :class:`~IPython.core.application.Application` object for the command
line :command:`ipython` program.
Authors
@@ -37,7 +37,7 @@ from IPython.core import release
from IPython.core import usage
from IPython.core.crashhandler import CrashHandler
from IPython.core.formatters import PlainTextFormatter
-from IPython.core.newapplication import (
+from IPython.core.application import (
ProfileDir, BaseIPythonApplication, base_flags, base_aliases
)
from IPython.core.shellapp import (
diff --git a/IPython/parallel/apps/baseapp.py b/IPython/parallel/apps/baseapp.py
index 081cd6c..0370a84 100755
--- a/IPython/parallel/apps/baseapp.py
+++ b/IPython/parallel/apps/baseapp.py
@@ -32,7 +32,7 @@ from subprocess import Popen, PIPE
from IPython.core import release
from IPython.core.crashhandler import CrashHandler
-from IPython.core.newapplication import (
+from IPython.core.application import (
BaseIPythonApplication,
base_aliases as base_ip_aliases,
base_flags as base_ip_flags
diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py
index efb3652..26b1606 100755
--- a/IPython/parallel/apps/ipclusterapp.py
+++ b/IPython/parallel/apps/ipclusterapp.py
@@ -33,7 +33,7 @@ from zmq.eventloop import ioloop
from IPython.config.application import Application, boolean_flag
from IPython.config.loader import Config
-from IPython.core.newapplication import BaseIPythonApplication, ProfileDir
+from IPython.core.application import BaseIPythonApplication, ProfileDir
from IPython.utils.daemonize import daemonize
from IPython.utils.importstring import import_item
from IPython.utils.traitlets import Int, Unicode, Bool, CFloat, Dict, List
diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/IPython/parallel/apps/ipcontrollerapp.py
index bda9cc5..b386560 100755
--- a/IPython/parallel/apps/ipcontrollerapp.py
+++ b/IPython/parallel/apps/ipcontrollerapp.py
@@ -37,7 +37,7 @@ from zmq.log.handlers import PUBHandler
from zmq.utils import jsonapi as json
from IPython.config.application import boolean_flag
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.parallel.apps.baseapp import (
BaseParallelApplication,
diff --git a/IPython/parallel/apps/ipengineapp.py b/IPython/parallel/apps/ipengineapp.py
index b6676bc..9e02093 100755
--- a/IPython/parallel/apps/ipengineapp.py
+++ b/IPython/parallel/apps/ipengineapp.py
@@ -28,7 +28,7 @@ import sys
import zmq
from zmq.eventloop import ioloop
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.parallel.apps.baseapp import BaseParallelApplication
from IPython.zmq.log import EnginePUBHandler
diff --git a/IPython/parallel/apps/iploggerapp.py b/IPython/parallel/apps/iploggerapp.py
index 2d48254..99f7ac0 100755
--- a/IPython/parallel/apps/iploggerapp.py
+++ b/IPython/parallel/apps/iploggerapp.py
@@ -25,7 +25,7 @@ import sys
import zmq
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.utils.traitlets import Bool, Dict, Unicode
from IPython.parallel.apps.baseapp import (
diff --git a/IPython/parallel/client/client.py b/IPython/parallel/client/client.py
index b330574..1c58008 100644
--- a/IPython/parallel/client/client.py
+++ b/IPython/parallel/client/client.py
@@ -40,7 +40,7 @@ from IPython.parallel import util
from IPython.zmq.session import Session, Message
from .asyncresult import AsyncResult, AsyncHubResult
-from IPython.core.newapplication import ProfileDir, ProfileDirError
+from IPython.core.application import ProfileDir, ProfileDirError
from .view import DirectView, LoadBalancedView
#--------------------------------------------------------------------------
diff --git a/IPython/parallel/controller/sqlitedb.py b/IPython/parallel/controller/sqlitedb.py
index 41123ef..d7390a6 100644
--- a/IPython/parallel/controller/sqlitedb.py
+++ b/IPython/parallel/controller/sqlitedb.py
@@ -141,7 +141,7 @@ class SQLiteDB(BaseDB):
self.table = '_'+self.session.replace('-','_')
if not self.location:
# get current profile
- from IPython.core.newapplication import BaseIPythonApplication
+ from IPython.core.application import BaseIPythonApplication
if BaseIPythonApplication.initialized():
app = BaseIPythonApplication.instance()
if app.profile_dir is not None:
diff --git a/IPython/zmq/ipkernel.py b/IPython/zmq/ipkernel.py
index 2db33fb..d628f44 100755
--- a/IPython/zmq/ipkernel.py
+++ b/IPython/zmq/ipkernel.py
@@ -28,7 +28,7 @@ import zmq
# Local imports.
from IPython.config.configurable import Configurable
from IPython.config.application import boolean_flag
-from IPython.core.newapplication import ProfileDir
+from IPython.core.application import ProfileDir
from IPython.core.shellapp import (
InteractiveShellApp, shell_flags, shell_aliases
)
diff --git a/IPython/zmq/kernelapp.py b/IPython/zmq/kernelapp.py
index f4672fb..43112c6 100644
--- a/IPython/zmq/kernelapp.py
+++ b/IPython/zmq/kernelapp.py
@@ -25,7 +25,7 @@ import zmq
# IPython imports.
from IPython.core.ultratb import FormattedTB
-from IPython.core.newapplication import (
+from IPython.core.application import (
BaseIPythonApplication, base_flags, base_aliases
)
from IPython.utils import io