##// END OF EJS Templates
Report if cwd does not exist and raise exception in BaseIPythonApplication...
Thomas Spura -
Show More
@@ -1,348 +1,342 b''
1 # encoding: utf-8
1 # encoding: utf-8
2 """
2 """
3 An application for IPython.
3 An application for IPython.
4
4
5 All top-level applications should use the classes in this module for
5 All top-level applications should use the classes in this module for
6 handling configuration and creating componenets.
6 handling configuration and creating componenets.
7
7
8 The job of an :class:`Application` is to create the master configuration
8 The job of an :class:`Application` is to create the master configuration
9 object and then create the configurable objects, passing the config to them.
9 object and then create the configurable objects, passing the config to them.
10
10
11 Authors:
11 Authors:
12
12
13 * Brian Granger
13 * Brian Granger
14 * Fernando Perez
14 * Fernando Perez
15 * Min RK
15 * Min RK
16
16
17 """
17 """
18
18
19 #-----------------------------------------------------------------------------
19 #-----------------------------------------------------------------------------
20 # Copyright (C) 2008-2011 The IPython Development Team
20 # Copyright (C) 2008-2011 The IPython Development Team
21 #
21 #
22 # Distributed under the terms of the BSD License. The full license is in
22 # Distributed under the terms of the BSD License. The full license is in
23 # the file COPYING, distributed as part of this software.
23 # the file COPYING, distributed as part of this software.
24 #-----------------------------------------------------------------------------
24 #-----------------------------------------------------------------------------
25
25
26 #-----------------------------------------------------------------------------
26 #-----------------------------------------------------------------------------
27 # Imports
27 # Imports
28 #-----------------------------------------------------------------------------
28 #-----------------------------------------------------------------------------
29
29
30 import atexit
30 import atexit
31 import glob
31 import glob
32 import logging
32 import logging
33 import os
33 import os
34 import shutil
34 import shutil
35 import sys
35 import sys
36
36
37 from IPython.config.application import Application, catch_config_error
37 from IPython.config.application import Application, catch_config_error
38 from IPython.config.loader import ConfigFileNotFound
38 from IPython.config.loader import ConfigFileNotFound
39 from IPython.core import release, crashhandler
39 from IPython.core import release, crashhandler
40 from IPython.core.profiledir import ProfileDir, ProfileDirError
40 from IPython.core.profiledir import ProfileDir, ProfileDirError
41 from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
41 from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
42 from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict
42 from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict
43
43
44 #-----------------------------------------------------------------------------
44 #-----------------------------------------------------------------------------
45 # Classes and functions
45 # Classes and functions
46 #-----------------------------------------------------------------------------
46 #-----------------------------------------------------------------------------
47
47
48
48
49 #-----------------------------------------------------------------------------
49 #-----------------------------------------------------------------------------
50 # Base Application Class
50 # Base Application Class
51 #-----------------------------------------------------------------------------
51 #-----------------------------------------------------------------------------
52
52
53 # aliases and flags
53 # aliases and flags
54
54
55 base_aliases = {
55 base_aliases = {
56 'profile' : 'BaseIPythonApplication.profile',
56 'profile' : 'BaseIPythonApplication.profile',
57 'ipython-dir' : 'BaseIPythonApplication.ipython_dir',
57 'ipython-dir' : 'BaseIPythonApplication.ipython_dir',
58 'log-level' : 'Application.log_level',
58 'log-level' : 'Application.log_level',
59 }
59 }
60
60
61 base_flags = dict(
61 base_flags = dict(
62 debug = ({'Application' : {'log_level' : logging.DEBUG}},
62 debug = ({'Application' : {'log_level' : logging.DEBUG}},
63 "set log level to logging.DEBUG (maximize logging output)"),
63 "set log level to logging.DEBUG (maximize logging output)"),
64 quiet = ({'Application' : {'log_level' : logging.CRITICAL}},
64 quiet = ({'Application' : {'log_level' : logging.CRITICAL}},
65 "set log level to logging.CRITICAL (minimize logging output)"),
65 "set log level to logging.CRITICAL (minimize logging output)"),
66 init = ({'BaseIPythonApplication' : {
66 init = ({'BaseIPythonApplication' : {
67 'copy_config_files' : True,
67 'copy_config_files' : True,
68 'auto_create' : True}
68 'auto_create' : True}
69 }, """Initialize profile with default config files. This is equivalent
69 }, """Initialize profile with default config files. This is equivalent
70 to running `ipython profile create <profile>` prior to startup.
70 to running `ipython profile create <profile>` prior to startup.
71 """)
71 """)
72 )
72 )
73
73
74
74
75 class BaseIPythonApplication(Application):
75 class BaseIPythonApplication(Application):
76
76
77 name = Unicode(u'ipython')
77 name = Unicode(u'ipython')
78 description = Unicode(u'IPython: an enhanced interactive Python shell.')
78 description = Unicode(u'IPython: an enhanced interactive Python shell.')
79 version = Unicode(release.version)
79 version = Unicode(release.version)
80
80
81 aliases = Dict(base_aliases)
81 aliases = Dict(base_aliases)
82 flags = Dict(base_flags)
82 flags = Dict(base_flags)
83 classes = List([ProfileDir])
83 classes = List([ProfileDir])
84
84
85 # Track whether the config_file has changed,
85 # Track whether the config_file has changed,
86 # because some logic happens only if we aren't using the default.
86 # because some logic happens only if we aren't using the default.
87 config_file_specified = Bool(False)
87 config_file_specified = Bool(False)
88
88
89 config_file_name = Unicode(u'ipython_config.py')
89 config_file_name = Unicode(u'ipython_config.py')
90 def _config_file_name_default(self):
90 def _config_file_name_default(self):
91 return self.name.replace('-','_') + u'_config.py'
91 return self.name.replace('-','_') + u'_config.py'
92 def _config_file_name_changed(self, name, old, new):
92 def _config_file_name_changed(self, name, old, new):
93 if new != old:
93 if new != old:
94 self.config_file_specified = True
94 self.config_file_specified = True
95
95
96 # The directory that contains IPython's builtin profiles.
96 # The directory that contains IPython's builtin profiles.
97 builtin_profile_dir = Unicode(
97 builtin_profile_dir = Unicode(
98 os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
98 os.path.join(get_ipython_package_dir(), u'config', u'profile', u'default')
99 )
99 )
100
100
101 config_file_paths = List(Unicode)
101 config_file_paths = List(Unicode)
102 def _config_file_paths_default(self):
102 def _config_file_paths_default(self):
103 return [os.getcwdu()]
103 return [os.getcwdu()]
104
104
105 profile = Unicode(u'default', config=True,
105 profile = Unicode(u'default', config=True,
106 help="""The IPython profile to use."""
106 help="""The IPython profile to use."""
107 )
107 )
108
108
109 def _profile_changed(self, name, old, new):
109 def _profile_changed(self, name, old, new):
110 self.builtin_profile_dir = os.path.join(
110 self.builtin_profile_dir = os.path.join(
111 get_ipython_package_dir(), u'config', u'profile', new
111 get_ipython_package_dir(), u'config', u'profile', new
112 )
112 )
113
113
114 ipython_dir = Unicode(get_ipython_dir(), config=True,
114 ipython_dir = Unicode(get_ipython_dir(), config=True,
115 help="""
115 help="""
116 The name of the IPython directory. This directory is used for logging
116 The name of the IPython directory. This directory is used for logging
117 configuration (through profiles), history storage, etc. The default
117 configuration (through profiles), history storage, etc. The default
118 is usually $HOME/.ipython. This options can also be specified through
118 is usually $HOME/.ipython. This options can also be specified through
119 the environment variable IPYTHONDIR.
119 the environment variable IPYTHONDIR.
120 """
120 """
121 )
121 )
122
122
123 overwrite = Bool(False, config=True,
123 overwrite = Bool(False, config=True,
124 help="""Whether to overwrite existing config files when copying""")
124 help="""Whether to overwrite existing config files when copying""")
125 auto_create = Bool(False, config=True,
125 auto_create = Bool(False, config=True,
126 help="""Whether to create profile dir if it doesn't exist""")
126 help="""Whether to create profile dir if it doesn't exist""")
127
127
128 config_files = List(Unicode)
128 config_files = List(Unicode)
129 def _config_files_default(self):
129 def _config_files_default(self):
130 return [u'ipython_config.py']
130 return [u'ipython_config.py']
131
131
132 copy_config_files = Bool(False, config=True,
132 copy_config_files = Bool(False, config=True,
133 help="""Whether to install the default config files into the profile dir.
133 help="""Whether to install the default config files into the profile dir.
134 If a new profile is being created, and IPython contains config files for that
134 If a new profile is being created, and IPython contains config files for that
135 profile, then they will be staged into the new directory. Otherwise,
135 profile, then they will be staged into the new directory. Otherwise,
136 default config files will be automatically generated.
136 default config files will be automatically generated.
137 """)
137 """)
138
138
139 verbose_crash = Bool(False, config=True,
139 verbose_crash = Bool(False, config=True,
140 help="""Create a massive crash report when IPython encounters what may be an
140 help="""Create a massive crash report when IPython encounters what may be an
141 internal error. The default is to append a short message to the
141 internal error. The default is to append a short message to the
142 usual traceback""")
142 usual traceback""")
143
143
144 # The class to use as the crash handler.
144 # The class to use as the crash handler.
145 crash_handler_class = Type(crashhandler.CrashHandler)
145 crash_handler_class = Type(crashhandler.CrashHandler)
146
146
147 def __init__(self, **kwargs):
147 def __init__(self, **kwargs):
148 super(BaseIPythonApplication, self).__init__(**kwargs)
148 super(BaseIPythonApplication, self).__init__(**kwargs)
149 # ensure current working directory exists
149 # ensure current working directory exists
150 level_up = False
151 while True:
152 try:
150 try:
153 directory = os.getcwdu()
151 directory = os.getcwdu()
154 except OSError:
152 except:
155 # search level up until directory exists
153 # raise exception
156 os.chdir("..")
154 self.log.error("Current working directory doesn't exist.")
157 level_up = True
155 raise
158 else:
159 if level_up:
160 self.log.warn("Current working directory doesn't exist.\nSetting to: %s"%(directory))
161 break
162
156
163 # ensure even default IPYTHONDIR exists
157 # ensure even default IPYTHONDIR exists
164 if not os.path.exists(self.ipython_dir):
158 if not os.path.exists(self.ipython_dir):
165 self._ipython_dir_changed('ipython_dir', self.ipython_dir, self.ipython_dir)
159 self._ipython_dir_changed('ipython_dir', self.ipython_dir, self.ipython_dir)
166
160
167 #-------------------------------------------------------------------------
161 #-------------------------------------------------------------------------
168 # Various stages of Application creation
162 # Various stages of Application creation
169 #-------------------------------------------------------------------------
163 #-------------------------------------------------------------------------
170
164
171 def init_crash_handler(self):
165 def init_crash_handler(self):
172 """Create a crash handler, typically setting sys.excepthook to it."""
166 """Create a crash handler, typically setting sys.excepthook to it."""
173 self.crash_handler = self.crash_handler_class(self)
167 self.crash_handler = self.crash_handler_class(self)
174 sys.excepthook = self.excepthook
168 sys.excepthook = self.excepthook
175 def unset_crashhandler():
169 def unset_crashhandler():
176 sys.excepthook = sys.__excepthook__
170 sys.excepthook = sys.__excepthook__
177 atexit.register(unset_crashhandler)
171 atexit.register(unset_crashhandler)
178
172
179 def excepthook(self, etype, evalue, tb):
173 def excepthook(self, etype, evalue, tb):
180 """this is sys.excepthook after init_crashhandler
174 """this is sys.excepthook after init_crashhandler
181
175
182 set self.verbose_crash=True to use our full crashhandler, instead of
176 set self.verbose_crash=True to use our full crashhandler, instead of
183 a regular traceback with a short message (crash_handler_lite)
177 a regular traceback with a short message (crash_handler_lite)
184 """
178 """
185
179
186 if self.verbose_crash:
180 if self.verbose_crash:
187 return self.crash_handler(etype, evalue, tb)
181 return self.crash_handler(etype, evalue, tb)
188 else:
182 else:
189 return crashhandler.crash_handler_lite(etype, evalue, tb)
183 return crashhandler.crash_handler_lite(etype, evalue, tb)
190
184
191 def _ipython_dir_changed(self, name, old, new):
185 def _ipython_dir_changed(self, name, old, new):
192 if old in sys.path:
186 if old in sys.path:
193 sys.path.remove(old)
187 sys.path.remove(old)
194 sys.path.append(os.path.abspath(new))
188 sys.path.append(os.path.abspath(new))
195 if not os.path.isdir(new):
189 if not os.path.isdir(new):
196 os.makedirs(new, mode=0o777)
190 os.makedirs(new, mode=0o777)
197 readme = os.path.join(new, 'README')
191 readme = os.path.join(new, 'README')
198 if not os.path.exists(readme):
192 if not os.path.exists(readme):
199 path = os.path.join(get_ipython_package_dir(), u'config', u'profile')
193 path = os.path.join(get_ipython_package_dir(), u'config', u'profile')
200 shutil.copy(os.path.join(path, 'README'), readme)
194 shutil.copy(os.path.join(path, 'README'), readme)
201 self.log.debug("IPYTHONDIR set to: %s" % new)
195 self.log.debug("IPYTHONDIR set to: %s" % new)
202
196
203 def load_config_file(self, suppress_errors=True):
197 def load_config_file(self, suppress_errors=True):
204 """Load the config file.
198 """Load the config file.
205
199
206 By default, errors in loading config are handled, and a warning
200 By default, errors in loading config are handled, and a warning
207 printed on screen. For testing, the suppress_errors option is set
201 printed on screen. For testing, the suppress_errors option is set
208 to False, so errors will make tests fail.
202 to False, so errors will make tests fail.
209 """
203 """
210 self.log.debug("Searching path %s for config files", self.config_file_paths)
204 self.log.debug("Searching path %s for config files", self.config_file_paths)
211 base_config = 'ipython_config.py'
205 base_config = 'ipython_config.py'
212 self.log.debug("Attempting to load config file: %s" %
206 self.log.debug("Attempting to load config file: %s" %
213 base_config)
207 base_config)
214 try:
208 try:
215 Application.load_config_file(
209 Application.load_config_file(
216 self,
210 self,
217 base_config,
211 base_config,
218 path=self.config_file_paths
212 path=self.config_file_paths
219 )
213 )
220 except ConfigFileNotFound:
214 except ConfigFileNotFound:
221 # ignore errors loading parent
215 # ignore errors loading parent
222 self.log.debug("Config file %s not found", base_config)
216 self.log.debug("Config file %s not found", base_config)
223 pass
217 pass
224 if self.config_file_name == base_config:
218 if self.config_file_name == base_config:
225 # don't load secondary config
219 # don't load secondary config
226 return
220 return
227 self.log.debug("Attempting to load config file: %s" %
221 self.log.debug("Attempting to load config file: %s" %
228 self.config_file_name)
222 self.config_file_name)
229 try:
223 try:
230 Application.load_config_file(
224 Application.load_config_file(
231 self,
225 self,
232 self.config_file_name,
226 self.config_file_name,
233 path=self.config_file_paths
227 path=self.config_file_paths
234 )
228 )
235 except ConfigFileNotFound:
229 except ConfigFileNotFound:
236 # Only warn if the default config file was NOT being used.
230 # Only warn if the default config file was NOT being used.
237 if self.config_file_specified:
231 if self.config_file_specified:
238 msg = self.log.warn
232 msg = self.log.warn
239 else:
233 else:
240 msg = self.log.debug
234 msg = self.log.debug
241 msg("Config file not found, skipping: %s", self.config_file_name)
235 msg("Config file not found, skipping: %s", self.config_file_name)
242 except:
236 except:
243 # For testing purposes.
237 # For testing purposes.
244 if not suppress_errors:
238 if not suppress_errors:
245 raise
239 raise
246 self.log.warn("Error loading config file: %s" %
240 self.log.warn("Error loading config file: %s" %
247 self.config_file_name, exc_info=True)
241 self.config_file_name, exc_info=True)
248
242
249 def init_profile_dir(self):
243 def init_profile_dir(self):
250 """initialize the profile dir"""
244 """initialize the profile dir"""
251 try:
245 try:
252 # location explicitly specified:
246 # location explicitly specified:
253 location = self.config.ProfileDir.location
247 location = self.config.ProfileDir.location
254 except AttributeError:
248 except AttributeError:
255 # location not specified, find by profile name
249 # location not specified, find by profile name
256 try:
250 try:
257 p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
251 p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
258 except ProfileDirError:
252 except ProfileDirError:
259 # not found, maybe create it (always create default profile)
253 # not found, maybe create it (always create default profile)
260 if self.auto_create or self.profile == 'default':
254 if self.auto_create or self.profile == 'default':
261 try:
255 try:
262 p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
256 p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
263 except ProfileDirError:
257 except ProfileDirError:
264 self.log.fatal("Could not create profile: %r"%self.profile)
258 self.log.fatal("Could not create profile: %r"%self.profile)
265 self.exit(1)
259 self.exit(1)
266 else:
260 else:
267 self.log.info("Created profile dir: %r"%p.location)
261 self.log.info("Created profile dir: %r"%p.location)
268 else:
262 else:
269 self.log.fatal("Profile %r not found."%self.profile)
263 self.log.fatal("Profile %r not found."%self.profile)
270 self.exit(1)
264 self.exit(1)
271 else:
265 else:
272 self.log.info("Using existing profile dir: %r"%p.location)
266 self.log.info("Using existing profile dir: %r"%p.location)
273 else:
267 else:
274 # location is fully specified
268 # location is fully specified
275 try:
269 try:
276 p = ProfileDir.find_profile_dir(location, self.config)
270 p = ProfileDir.find_profile_dir(location, self.config)
277 except ProfileDirError:
271 except ProfileDirError:
278 # not found, maybe create it
272 # not found, maybe create it
279 if self.auto_create:
273 if self.auto_create:
280 try:
274 try:
281 p = ProfileDir.create_profile_dir(location, self.config)
275 p = ProfileDir.create_profile_dir(location, self.config)
282 except ProfileDirError:
276 except ProfileDirError:
283 self.log.fatal("Could not create profile directory: %r"%location)
277 self.log.fatal("Could not create profile directory: %r"%location)
284 self.exit(1)
278 self.exit(1)
285 else:
279 else:
286 self.log.info("Creating new profile dir: %r"%location)
280 self.log.info("Creating new profile dir: %r"%location)
287 else:
281 else:
288 self.log.fatal("Profile directory %r not found."%location)
282 self.log.fatal("Profile directory %r not found."%location)
289 self.exit(1)
283 self.exit(1)
290 else:
284 else:
291 self.log.info("Using existing profile dir: %r"%location)
285 self.log.info("Using existing profile dir: %r"%location)
292
286
293 self.profile_dir = p
287 self.profile_dir = p
294 self.config_file_paths.append(p.location)
288 self.config_file_paths.append(p.location)
295
289
296 def init_config_files(self):
290 def init_config_files(self):
297 """[optionally] copy default config files into profile dir."""
291 """[optionally] copy default config files into profile dir."""
298 # copy config files
292 # copy config files
299 path = self.builtin_profile_dir
293 path = self.builtin_profile_dir
300 if self.copy_config_files:
294 if self.copy_config_files:
301 src = self.profile
295 src = self.profile
302
296
303 cfg = self.config_file_name
297 cfg = self.config_file_name
304 if path and os.path.exists(os.path.join(path, cfg)):
298 if path and os.path.exists(os.path.join(path, cfg)):
305 self.log.warn("Staging %r from %s into %r [overwrite=%s]"%(
299 self.log.warn("Staging %r from %s into %r [overwrite=%s]"%(
306 cfg, src, self.profile_dir.location, self.overwrite)
300 cfg, src, self.profile_dir.location, self.overwrite)
307 )
301 )
308 self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite)
302 self.profile_dir.copy_config_file(cfg, path=path, overwrite=self.overwrite)
309 else:
303 else:
310 self.stage_default_config_file()
304 self.stage_default_config_file()
311 else:
305 else:
312 # Still stage *bundled* config files, but not generated ones
306 # Still stage *bundled* config files, but not generated ones
313 # This is necessary for `ipython profile=sympy` to load the profile
307 # This is necessary for `ipython profile=sympy` to load the profile
314 # on the first go
308 # on the first go
315 files = glob.glob(os.path.join(path, '*.py'))
309 files = glob.glob(os.path.join(path, '*.py'))
316 for fullpath in files:
310 for fullpath in files:
317 cfg = os.path.basename(fullpath)
311 cfg = os.path.basename(fullpath)
318 if self.profile_dir.copy_config_file(cfg, path=path, overwrite=False):
312 if self.profile_dir.copy_config_file(cfg, path=path, overwrite=False):
319 # file was copied
313 # file was copied
320 self.log.warn("Staging bundled %s from %s into %r"%(
314 self.log.warn("Staging bundled %s from %s into %r"%(
321 cfg, self.profile, self.profile_dir.location)
315 cfg, self.profile, self.profile_dir.location)
322 )
316 )
323
317
324
318
325 def stage_default_config_file(self):
319 def stage_default_config_file(self):
326 """auto generate default config file, and stage it into the profile."""
320 """auto generate default config file, and stage it into the profile."""
327 s = self.generate_config_file()
321 s = self.generate_config_file()
328 fname = os.path.join(self.profile_dir.location, self.config_file_name)
322 fname = os.path.join(self.profile_dir.location, self.config_file_name)
329 if self.overwrite or not os.path.exists(fname):
323 if self.overwrite or not os.path.exists(fname):
330 self.log.warn("Generating default config file: %r"%(fname))
324 self.log.warn("Generating default config file: %r"%(fname))
331 with open(fname, 'w') as f:
325 with open(fname, 'w') as f:
332 f.write(s)
326 f.write(s)
333
327
334 @catch_config_error
328 @catch_config_error
335 def initialize(self, argv=None):
329 def initialize(self, argv=None):
336 # don't hook up crash handler before parsing command-line
330 # don't hook up crash handler before parsing command-line
337 self.parse_command_line(argv)
331 self.parse_command_line(argv)
338 self.init_crash_handler()
332 self.init_crash_handler()
339 if self.subapp is not None:
333 if self.subapp is not None:
340 # stop here if subapp is taking over
334 # stop here if subapp is taking over
341 return
335 return
342 cl_config = self.config
336 cl_config = self.config
343 self.init_profile_dir()
337 self.init_profile_dir()
344 self.init_config_files()
338 self.init_config_files()
345 self.load_config_file()
339 self.load_config_file()
346 # enforce cl-opts override configfile opts:
340 # enforce cl-opts override configfile opts:
347 self.update_config(cl_config)
341 self.update_config(cl_config)
348
342
@@ -1,18 +1,25 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 # encoding: utf-8
2 # encoding: utf-8
3
3
4 #-----------------------------------------------------------------------------
4 #-----------------------------------------------------------------------------
5 # Copyright (C) 2008-2009 The IPython Development Team
5 # Copyright (C) 2008-2009 The IPython Development Team
6 #
6 #
7 # Distributed under the terms of the BSD License. The full license is in
7 # Distributed under the terms of the BSD License. The full license is in
8 # the file COPYING, distributed as part of this software.
8 # the file COPYING, distributed as part of this software.
9 #-----------------------------------------------------------------------------
9 #-----------------------------------------------------------------------------
10
10
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12 # Imports
12 # Imports
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14
14 import sys
15 import traceback
15
16
16 from IPython.parallel.apps.ipclusterapp import launch_new_instance
17 from IPython.parallel.apps.ipclusterapp import launch_new_instance
17
18
19 try:
18 launch_new_instance()
20 launch_new_instance()
21 except:
22 exc_type, exc_value, exc_traceback = sys.exc_info()
23 traceback.print_exception(exc_type, exc_value, exc_traceback,
24 file=sys.stderr)
25 sys.exit(1)
@@ -1,18 +1,25 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 # encoding: utf-8
2 # encoding: utf-8
3
3
4 #-----------------------------------------------------------------------------
4 #-----------------------------------------------------------------------------
5 # Copyright (C) 2008-2009 The IPython Development Team
5 # Copyright (C) 2008-2009 The IPython Development Team
6 #
6 #
7 # Distributed under the terms of the BSD License. The full license is in
7 # Distributed under the terms of the BSD License. The full license is in
8 # the file COPYING, distributed as part of this software.
8 # the file COPYING, distributed as part of this software.
9 #-----------------------------------------------------------------------------
9 #-----------------------------------------------------------------------------
10
10
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12 # Imports
12 # Imports
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14
14 import sys
15 import traceback
15
16
16 from IPython.parallel.apps.ipcontrollerapp import launch_new_instance
17 from IPython.parallel.apps.ipcontrollerapp import launch_new_instance
17
18
19 try:
18 launch_new_instance()
20 launch_new_instance()
21 except:
22 exc_type, exc_value, exc_traceback = sys.exc_info()
23 traceback.print_exception(exc_type, exc_value, exc_traceback,
24 file=sys.stderr)
25 sys.exit(1)
@@ -1,20 +1,25 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 # encoding: utf-8
2 # encoding: utf-8
3
3
4 #-----------------------------------------------------------------------------
4 #-----------------------------------------------------------------------------
5 # Copyright (C) 2008-2009 The IPython Development Team
5 # Copyright (C) 2008-2009 The IPython Development Team
6 #
6 #
7 # Distributed under the terms of the BSD License. The full license is in
7 # Distributed under the terms of the BSD License. The full license is in
8 # the file COPYING, distributed as part of this software.
8 # the file COPYING, distributed as part of this software.
9 #-----------------------------------------------------------------------------
9 #-----------------------------------------------------------------------------
10
10
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12 # Imports
12 # Imports
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14
14 import sys
15 import traceback
15
16
16 from IPython.parallel.apps.ipengineapp import launch_new_instance
17 from IPython.parallel.apps.ipengineapp import launch_new_instance
17
18
19 try:
18 launch_new_instance()
20 launch_new_instance()
19
21 except:
20
22 exc_type, exc_value, exc_traceback = sys.exc_info()
23 traceback.print_exception(exc_type, exc_value, exc_traceback,
24 file=sys.stderr)
25 sys.exit(1)
@@ -1,20 +1,25 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 # encoding: utf-8
2 # encoding: utf-8
3
3
4 #-----------------------------------------------------------------------------
4 #-----------------------------------------------------------------------------
5 # Copyright (C) 2008-2009 The IPython Development Team
5 # Copyright (C) 2008-2009 The IPython Development Team
6 #
6 #
7 # Distributed under the terms of the BSD License. The full license is in
7 # Distributed under the terms of the BSD License. The full license is in
8 # the file COPYING, distributed as part of this software.
8 # the file COPYING, distributed as part of this software.
9 #-----------------------------------------------------------------------------
9 #-----------------------------------------------------------------------------
10
10
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12 # Imports
12 # Imports
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14
14 import sys
15 import traceback
15
16
16 from IPython.parallel.apps.iploggerapp import launch_new_instance
17 from IPython.parallel.apps.iploggerapp import launch_new_instance
17
18
19 try:
18 launch_new_instance()
20 launch_new_instance()
19
21 except:
20
22 exc_type, exc_value, exc_traceback = sys.exc_info()
23 traceback.print_exception(exc_type, exc_value, exc_traceback,
24 file=sys.stderr)
25 sys.exit(1)
@@ -1,7 +1,15 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 """Terminal-based IPython entry point.
2 """Terminal-based IPython entry point.
3 """
3 """
4 import sys
5 import traceback
4
6
5 from IPython.frontend.terminal.ipapp import launch_new_instance
7 from IPython.frontend.terminal.ipapp import launch_new_instance
6
8
9 try:
7 launch_new_instance()
10 launch_new_instance()
11 except:
12 exc_type, exc_value, exc_traceback = sys.exc_info()
13 traceback.print_exception(exc_type, exc_value, exc_traceback,
14 file=sys.stderr)
15 sys.exit(1)
General Comments 0
You need to be logged in to leave comments. Login now