##// END OF EJS Templates
ipy_which.py added (%which magic)...
ipy_which.py added (%which magic) _ip.expand_alias now returns the result ipy_profile_sh.py imports ipy_which

File last commit:

r619:8630b292
r620:fcd35c9f
Show More
iplib.py
2623 lines | 101.7 KiB | text/x-python | PythonLexer
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # -*- coding: utf-8 -*-
"""
IPython -- An enhanced Interactive Python
vivainio
Added ipapi, the extension api for ipython....
r109 Requires Python 2.3 or newer.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
This file contains all the classes and helper functions specific to IPython.
jstenar
Fix bug in iplib.py/safe_execfile that raises an IndexError when ipython is launched with a script as in ./ipython.py foo.py
r619 $Id: iplib.py 2266 2007-04-22 18:55:48Z jstenar $
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """
#*****************************************************************************
# Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
fperez
Small fix in ultraTB, and fix autocall....
r88 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#
# Note: this code originally subclassed code.InteractiveConsole from the
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 # Python standard library. Over time, all of that class has been copied
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # verbatim here for modifications which could not be accomplished by
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 # subclassing. At this point, there are no dependencies at all on the code
# module anymore (it is not even imported). The Python License (sec. 2)
# allows for this, but it's always nice to acknowledge credit where credit is
# due.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #*****************************************************************************
#****************************************************************************
# Modules and globals
from IPython import Release
__author__ = '%s <%s>\n%s <%s>' % \
( Release.authors['Janko'] + Release.authors['Fernando'] )
__license__ = Release.license
__version__ = Release.version
# Python standard modules
import __main__
import __builtin__
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 import StringIO
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 import bdb
import cPickle as pickle
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 import codeop
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 import exceptions
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 import glob
import inspect
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 import keyword
import new
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 import os
import pydoc
import re
import shutil
import string
import sys
fperez
Fixes to:...
r82 import tempfile
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 import traceback
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 import types
vivainio
Grand Persistence Overhaul, featuring PickleShare. startup...
r165 import pickleshare
vivainio
prevent cyclic alias definitions
r377 from sets import Set
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 from pprint import pprint, pformat
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# IPython's own modules
import IPython
fperez
Prevent %debug from not working if pydb 1.17 is installed, which has a fatal bug
r587 from IPython import Debugger,OInspect,PyColorize,ultraTB
fperez
- Fairly significant changes to include Vivian's patches for improved pdb...
r46 from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 from IPython.FakeModule import FakeModule
from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 from IPython.Logger import Logger
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 from IPython.Magic import Magic
from IPython.Prompts import CachedOutput
fperez
Rename Struct to ipstruct, to fix a bug under windows due to shadowing of...
r98 from IPython.ipstruct import Struct
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 from IPython.background_jobs import BackgroundJobManager
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 from IPython.usage import cmd_line_usage,interactive_usage
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 from IPython.genutils import *
vivainio
First round of 'complete_command' hook, implements customizable command line ...
r394 from IPython.strdispatch import StrDispatch
vivainio
Added ipapi, the extension api for ipython....
r109 import IPython.ipapi
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Small fix in ultraTB, and fix autocall....
r88 # Globals
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # store the builtin raw_input globally, and use this always, in case user code
# overwrites it (like wx.py.PyShell does)
raw_input_original = raw_input
fperez
- thread-safety fixes...
r69 # compiled regexps for autoindent management
dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass')
fperez
Small fix in ultraTB, and fix autocall....
r88
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #****************************************************************************
# Some utility function definitions
fperez
%autocall fixes...
r106 ini_spaces_re = re.compile(r'^(\s+)')
def num_ini_spaces(strng):
"""Return the number of initial spaces in a string"""
ini_spaces = ini_spaces_re.match(strng)
if ini_spaces:
return ini_spaces.end()
else:
return 0
fperez
more cleanups...
r61 def softspace(file, newvalue):
"""Copied from code.py, to remove the dependency"""
fperez
%autocall fixes...
r106
fperez
more cleanups...
r61 oldvalue = 0
try:
oldvalue = file.softspace
except AttributeError:
pass
try:
file.softspace = newvalue
except (AttributeError, TypeError):
# "attribute-less object" or "read-only attributes"
pass
return oldvalue
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
- Fix autoindent which I had broken......
r72
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 #****************************************************************************
# Local use exceptions
class SpaceInInput(exceptions.Exception): pass
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Small fix in ultraTB, and fix autocall....
r88
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 #****************************************************************************
# Local use classes
class Bunch: pass
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Fixes to:...
r82 class Undefined: pass
fperez
Add nice exit/quit message to the exit functions.
r369 class Quitter(object):
"""Simple class to handle exit, similar to Python 2.5's.
It handles exiting in an ipython-safe manner, which the one in Python 2.5
doesn't do (obviously, since it doesn't know about ipython)."""
def __init__(self,shell,name):
self.shell = shell
self.name = name
def __repr__(self):
return 'Type %s() to exit.' % self.name
__str__ = __repr__
def __call__(self):
self.shell.exit()
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 class InputList(list):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """Class to store user input.
It's basically a list, but slices return a string instead of a list, thus
allowing things like (assuming 'In' is an instance):
exec In[4:7]
or
exec In[5:9] + In[14] + In[21:25]"""
def __getslice__(self,i,j):
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 return ''.join(list.__getslice__(self,i,j))
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Added support for automatically reopening the editor if the file had a...
r54 class SyntaxTB(ultraTB.ListTB):
"""Extension which holds some state: the last exception value"""
def __init__(self,color_scheme = 'NoColor'):
ultraTB.ListTB.__init__(self,color_scheme)
self.last_syntax_error = None
def __call__(self, etype, value, elist):
self.last_syntax_error = value
ultraTB.ListTB.__call__(self,etype,value,elist)
def clear_err_state(self):
"""Return the current error state and clear it"""
e = self.last_syntax_error
self.last_syntax_error = None
return e
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #****************************************************************************
# Main IPython class
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60
# FIXME: the Magic class is a mixin for now, and will unfortunately remain so
# until a full rewrite is made. I've cleaned all cross-class uses of
# attributes and methods, but too much user code out there relies on the
# equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage.
#
# But at least now, all the pieces have been separated and we could, in
# principle, stop using the mixin. This will ease the transition to the
# chainsaw branch.
# For reference, the following is the list of 'self.foo' uses in the Magic
# class as of 2005-12-28. These are names we CAN'T use in the main ipython
# class, to prevent clashes.
# ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind',
# 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic',
# 'self.magic_', 'self.options_table', 'self.parse', 'self.shell',
# 'self.value']
fperez
Pdb calling, pickle (under certain circumstances, connected with %run) and...
r78 class InteractiveShell(object,Magic):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """An enhanced console for Python."""
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 # class attribute to indicate whether the class supports threads or not.
# Subclasses with thread support should override this as needed.
isthreaded = False
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 user_ns = None,user_global_ns=None,banner2='',
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 custom_exceptions=((),None),embedded=False):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
vivainio
Initialize logger earlier (__init__ instead of post-config-initialization)
r124 # log system
self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate')
fperez
Fix tab-completion bug in threaded shells.x
r58 # some minimal strict typechecks. For some core data structures, I
# want actual basic python types, not just anything that looks like
# one. This is especially true for namespaces.
for ns in (user_ns,user_global_ns):
if ns is not None and type(ns) != types.DictType:
raise TypeError,'namespace must be a dictionary'
fperez
Fixes to:...
r82 # Job manager (for jobs run as background threads)
self.jobs = BackgroundJobManager()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 # Store the actual shell's name
self.name = name
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 # We need to know whether the instance is meant for embedding, since
# global/local namespaces need to be handled differently in that case
self.embedded = embedded
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 # command compiler
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.compile = codeop.CommandCompiler()
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39
# User input buffer
self.buffer = []
# Default name given in compilation of code
self.filename = '<ipython console>'
fperez
- Cleanup [1786], which went in with unfinished stuff by accident....
r368 # Install our own quitter instead of the builtins. For python2.3-2.4,
fperez
Add nice exit/quit message to the exit functions.
r369 # this brings in behavior like 2.5, and for 2.5 it's identical.
__builtin__.exit = Quitter(self,'exit')
__builtin__.quit = Quitter(self,'quit')
fperez
add .meta namespace for extension writers.
r81 # Make an empty namespace, which extension writers can rely on both
# existing and NEVER being used by ipython itself. This gives them a
# convenient location for storing additional information and state
# their extensions may require, without fear of collisions with other
# ipython names that may develop later.
vivainio
a = !ls, a = %alias now work (captures output or gets ret val for aliases)...
r151 self.meta = Struct()
fperez
add .meta namespace for extension writers.
r81
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 # Create the namespace where the user will operate. user_ns is
# normally the only one used, and it is passed to the exec calls as
# the locals argument. But we do carry a user_global_ns namespace
# given as the exec 'globals' argument, This is useful in embedding
# situations where the ipython shell opens in a context where the
# distinction between locals and globals is meaningful.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# FIXME. For some strange reason, __builtins__ is showing up at user
# level as a dict instead of a module. This is a manual fix, but I
# should really track down where the problem is coming from. Alex
# Schmolck reported this problem first.
# A useful post by Alex Martelli on this topic:
# Re: inconsistent value from __builtins__
# Von: Alex Martelli <aleaxit@yahoo.com>
# Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
# Gruppen: comp.lang.python
# Michael Hohn <hohn@hooknose.lbl.gov> wrote:
# > >>> print type(builtin_check.get_global_binding('__builtins__'))
# > <type 'dict'>
# > >>> print type(__builtins__)
# > <type 'module'>
# > Is this difference in return value intentional?
# Well, it's documented that '__builtins__' can be either a dictionary
# or a module, and it's been that way for a long time. Whether it's
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 # intentional (or sensible), I don't know. In any case, the idea is
# that if you need to access the built-in namespace directly, you
# should start with "import __builtin__" (note, no 's') which will
vivainio
Merge from branches/0.7.1 into trunk, revs 1052-1057
r136 # definitely give you a module. Yeah, it's somewhat confusing:-(.
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39
fperez
- Fix problems with -pylab and custom namespaces....
r296 # These routines return properly built dicts as needed by the rest of
# the code, and can also be used by extension writers to generate
# properly initialized namespaces.
user_ns = IPython.ipapi.make_user_ns(user_ns)
user_global_ns = IPython.ipapi.make_user_global_ns(user_global_ns)
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 # Assign namespaces
# This is the namespace where all normal user variables live
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 self.user_ns = user_ns
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 # Embedded instances require a separate namespace for globals.
# Normally this one is unused by non-embedded instances.
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 self.user_global_ns = user_global_ns
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 # A namespace to keep track of internal data structures to prevent
# them from cluttering user-visible stuff. Will be updated later
self.internal_ns = {}
# Namespace of system aliases. Each entry in the alias
# table must be a 2-tuple of the form (N,name), where N is the number
# of positional arguments of the alias.
self.alias_table = {}
# A table holding all the namespaces IPython deals with, so that
# introspection facilities can search easily.
self.ns_table = {'user':user_ns,
'user_global':user_global_ns,
'alias':self.alias_table,
'internal':self.internal_ns,
'builtin':__builtin__.__dict__
}
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# The user namespace MUST have a pointer to the shell itself.
self.user_ns[name] = self
# We need to insert into sys.modules something that looks like a
# module but which accesses the IPython namespace, for shelve and
# pickle to work interactively. Normally they rely on getting
# everything out of __main__, but for embedding purposes each IPython
# instance has its own private namespace, so we can't go shoving
# everything into __main__.
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47 # note, however, that we should only do this for non-embedded
# ipythons, which really mimic the __main__.__dict__ with their own
# namespace. Embedded instances, on the other hand, should not do
# this because they need to manage the user local/global namespaces
# only, but they live within a 'normal' __main__ (meaning, they
# shouldn't overtake the execution environment of the script they're
# embedded in).
if not embedded:
try:
main_name = self.user_ns['__name__']
except KeyError:
raise KeyError,'user_ns dictionary MUST have a "__name__" key'
else:
#print "pickle hack in place" # dbg
fperez
Pdb calling, pickle (under certain circumstances, connected with %run) and...
r78 #print 'main_name:',main_name # dbg
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47 sys.modules[main_name] = FakeModule(self.user_ns)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# List of input with multi-line handling.
# Fill its zero entry, user counter starts at 1
self.input_hist = InputList(['\n'])
vivainio
Merged 1071-1076 from banches/0.7.1
r145 # This one will hold the 'raw' input history, without any
# pre-processing. This will allow users to retrieve the input just as
# it was exactly typed in by the user, with %hist -r.
self.input_hist_raw = InputList(['\n'])
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# list of visited directories
fperez
Close issue 41, remove obsolete gtk 1.x code, trap os.getcwd exceptions at...
r18 try:
self.dir_hist = [os.getcwd()]
except IOError, e:
self.dir_hist = []
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# dict of output history
self.output_hist = {}
jdh2358
- Final commits for 0.8.0 tag....
r595 # Get system encoding at startup time. Certain terminals (like Emacs
# under Win32 have it set to None, and we need to have a known valid
# encoding to use in the raw_input() method
self.stdin_encoding = sys.stdin.encoding or 'ascii'
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 # dict of things NOT to alias (keywords, builtins and some magics)
fperez
Close issue 41, remove obsolete gtk 1.x code, trap os.getcwd exceptions at...
r18 no_alias = {}
no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias']
for key in keyword.kwlist + no_alias_magics:
no_alias[key] = 1
no_alias.update(__builtin__.__dict__)
self.no_alias = no_alias
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # make global variables for user access to these
self.user_ns['_ih'] = self.input_hist
self.user_ns['_oh'] = self.output_hist
self.user_ns['_dh'] = self.dir_hist
# user aliases to input and output histories
self.user_ns['In'] = self.input_hist
self.user_ns['Out'] = self.output_hist
# Object variable to store code object waiting execution. This is
# used mainly by the multithreaded shells, but it can come in handy in
# other situations. No need to use a Queue here, since it's a single
# item which gets cleared once run.
self.code_to_run = None
# escapes for automatic behavior on the command line
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 self.ESC_SHELL = '!'
self.ESC_HELP = '?'
self.ESC_MAGIC = '%'
self.ESC_QUOTE = ','
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.ESC_QUOTE2 = ';'
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 self.ESC_PAREN = '/'
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# And their associated handlers
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 self.esc_handlers = {self.ESC_PAREN : self.handle_auto,
self.ESC_QUOTE : self.handle_auto,
self.ESC_QUOTE2 : self.handle_auto,
self.ESC_MAGIC : self.handle_magic,
self.ESC_HELP : self.handle_help,
self.ESC_SHELL : self.handle_shell_escape,
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 }
# class initializations
Magic.__init__(self,self)
fperez
Finish up demo api/docs, manual improvements, other fixes. Manual work...
r31 # Python source parser/formatter for syntax highlighting
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 pyformat = PyColorize.Parser().format
fperez
Finish up demo api/docs, manual improvements, other fixes. Manual work...
r31 self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors'])
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # hooks holds pointers used for user-side customizations
self.hooks = Struct()
vivainio
First round of 'complete_command' hook, implements customizable command line ...
r394 self.strdispatchers = {}
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Set all default hooks, defined in the IPython.hooks module.
hooks = IPython.hooks
for hook_name in hooks.__all__:
jdh2358
- Final commits for 0.8.0 tag....
r595 # default hooks have priority 100, i.e. low; user hooks should have
# 0-100 priority
vivainio
Hooks now implement "Chain of Command" design pattern,...
r112 self.set_hook(hook_name,getattr(hooks,hook_name), 100)
vivainio
whoops, lasth commit was an accident - but it works....
r150 #print "bound hook",hook_name
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# Flag to mark unconditional exit
self.exit_now = False
self.usage_min = """\
An enhanced console for Python.
Some of its features are:
- Readline support if the readline library is present.
- Tab completion in the local namespace.
- Logging of input, see command-line options.
- System shell escape via ! , eg !ls.
- Magic commands, starting with a % (like %ls, %pwd, %cd, etc.)
- Keeps track of locally defined variables via %who, %whos.
- Show object information with a ? eg ?x or x? (use ?? for more info).
"""
if usage: self.usage = usage
else: self.usage = self.usage_min
# Storage
self.rc = rc # This will hold all configuration information
self.pager = 'less'
# temporary files used for various purposes. Deleted at exit.
self.tempfiles = []
fperez
Close http://www.scipy.net/roundup/ipython/issue40, add OSX install info to...
r11 # Keep track of readline usage (later set by init_readline)
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.has_readline = False
fperez
Close http://www.scipy.net/roundup/ipython/issue40, add OSX install info to...
r11
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 # template for logfile headers. It gets resolved at runtime by the
# logstart method.
self.loghead_tpl = \
"""#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
#log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
#log# opts = %s
#log# args = %s
#log# It is safe to make manual edits below here.
#log#-----------------------------------------------------------------------
"""
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # for pushd/popd management
try:
self.home_dir = get_home_dir()
except HomeDirError,msg:
fatal(msg)
self.dir_stack = [os.getcwd().replace(self.home_dir,'~')]
# Functions to call the underlying shell.
# The first is similar to os.system, but it doesn't return a value,
# and it allows interpolation of variables in the user's namespace.
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 self.system = lambda cmd: \
shell(self.var_expand(cmd,depth=2),
fptest
- Add a new ipconfig() public function for manipulating the internal rc...
r418 header=self.rc.system_header,
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 verbose=self.rc.system_verbose)
fptest
- Add a new ipconfig() public function for manipulating the internal rc...
r418
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # These are for getoutput and getoutputerror:
self.getoutput = lambda cmd: \
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 getoutput(self.var_expand(cmd,depth=2),
fptest
- Add a new ipconfig() public function for manipulating the internal rc...
r418 header=self.rc.system_header,
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 verbose=self.rc.system_verbose)
fptest
- Add a new ipconfig() public function for manipulating the internal rc...
r418
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.getoutputerror = lambda cmd: \
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 getoutputerror(self.var_expand(cmd,depth=2),
fptest
- Add a new ipconfig() public function for manipulating the internal rc...
r418 header=self.rc.system_header,
fperez
oops, invalid syntax committed...
r317 verbose=self.rc.system_verbose)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# RegExp for splitting line contents into pre-char//first
# word-method//rest. For clarity, each group in on one line.
# WARNING: update the regexp if the above escapes are changed, as they
# are hardwired in.
# Don't get carried away with trying to make the autocalling catch too
# much: it's better to be conservative rather than to trigger hidden
# evals() somewhere and end up causing side effects.
fperez
Proper fix for tab-completion bug reported by Alex Schmolck; patch by Dan Milstein
r540 self.line_split = re.compile(r'^(\s*[,;/]?\s*)'
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 r'([\?\w\.]+\w*\s*)'
r'(\(?.*$)')
vivainio
split_user_input users different pattern for splitting in alias expansion
r569 self.shell_line_split = re.compile(r'^(\s*)'
r'(\S*\s*)'
r'(\(?.*$)')
fperez
Fixes to input splitting to reduce the occurrences of spurious attribute...
r529 # A simpler regexp used as a fallback if the above doesn't work. This
# one is more conservative in how it partitions the input. This code
# can probably be cleaned up to do everything with just one regexp, but
# I'm afraid of breaking something; do it once the unit tests are in
# place.
self.line_split_fallback = re.compile(r'^(\s*)'
fperez
Previous commit was incomplete...
r531 r'([%\!\?\w\.]*)'
fperez
Fixes to input splitting to reduce the occurrences of spurious attribute...
r529 r'(.*)')
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Original re, keep around for a while in case changes break something
#self.line_split = re.compile(r'(^[\s*!\?%,/]?)'
# r'(\s*[\?\w\.]+\w*\s*)'
# r'(\(?.*$)')
# RegExp to identify potential function names
self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
fperez
%autocall fixes...
r106
# RegExp to exclude strings with this start from autocalling. In
# particular, all binary operators should be excluded, so that if foo
# is callable, foo OP bar doesn't become foo(OP bar), which is
# invalid. The characters '!=()' don't need to be checked for, as the
# _prefilter routine explicitely does so, to catch direct calls and
# rebindings of existing names.
# Warning: the '-' HAS TO BE AT THE END of the first group, otherwise
# it affects the rest of the group in square brackets.
self.re_exclude_auto = re.compile(r'^[<>,&^\|\*/\+-]'
'|^is |^not |^in |^and |^or ')
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # try to catch also methods for stuff in lists/tuples/dicts: off
# (experimental). For this to work, the line_split regexp would need
# to be modified so it wouldn't break things at '['. That line is
# nasty enough that I shouldn't change it until I can test it _well_.
#self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$')
# keep track of where we started running (mainly for crash post-mortem)
self.starting_dir = os.getcwd()
# Various switches which can be set
self.CACHELENGTH = 5000 # this is cheap, it's just text
self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__
self.banner2 = banner2
# TraceBack handlers:
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
# Syntax error handler.
fperez
Added support for automatically reopening the editor if the file had a...
r54 self.SyntaxTB = SyntaxTB(color_scheme='NoColor')
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
fperez
Added support for automatically reopening the editor if the file had a...
r54 # The interactive one is initialized with an offset, meaning we always
# want to remove the topmost item in the traceback, which is our own
# internal code. Valid modes: ['Plain','Context','Verbose']
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain',
color_scheme='NoColor',
tb_offset = 1)
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
# IPython itself shouldn't crash. This will produce a detailed
# post-mortem if it does. But we only install the crash handler for
# non-threaded shells, the threaded ones use a normal verbose reporter
# and lose the crash handler. This is because exceptions in the main
# thread (such as in GUI code) propagate directly to sys.excepthook,
# and there's no point in printing crash dumps for every user exception.
if self.isthreaded:
fptest
- Made the internal crash handler very customizable for end-user apps based...
r381 ipCrashHandler = ultraTB.FormattedTB()
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 else:
from IPython import CrashHandler
fptest
- Made the internal crash handler very customizable for end-user apps based...
r381 ipCrashHandler = CrashHandler.IPythonCrashHandler(self)
self.set_crash_handler(ipCrashHandler)
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # and add any custom exception handlers the user may have specified
self.set_custom_exc(*custom_exceptions)
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 # indentation management
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.autoindent = False
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 self.indent_current_nsp = 0
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# Make some aliases automatically
# Prepare list of shell aliases to auto-define
walter.doerwald
Whitespace cleanup.
r253 if os.name == 'posix':
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 auto_alias = ('mkdir mkdir', 'rmdir rmdir',
'mv mv -i','rm rm -i','cp cp -i',
'cat cat','less less','clear clear',
# a better ls
'ls ls -F',
# long ls
fperez
Close #64, if W. Maier confirms this fix works.
r304 'll ls -lF')
# Extra ls aliases with color, which need special treatment on BSD
# variants
ls_extra = ( # color ls
'lc ls -F -o --color',
# ls normal files only
'lf ls -F -o --color %l | grep ^-',
# ls symbolic links
'lk ls -F -o --color %l | grep ^l',
# directories or links to directories,
'ldir ls -F -o --color %l | grep /$',
# things which are executable
'lx ls -F -o --color %l | grep ^-..x',
)
# The BSDs don't ship GNU ls, so they don't understand the
# --color switch out of the box
if 'bsd' in sys.platform:
ls_extra = ( # ls normal files only
fperez
Update BSD fix for aliases, the previous patch was incomplete. Submitted by...
r324 'lf ls -lF | grep ^-',
fperez
Close #64, if W. Maier confirms this fix works.
r304 # ls symbolic links
fperez
Update BSD fix for aliases, the previous patch was incomplete. Submitted by...
r324 'lk ls -lF | grep ^l',
fperez
Close #64, if W. Maier confirms this fix works.
r304 # directories or links to directories,
fperez
Update BSD fix for aliases, the previous patch was incomplete. Submitted by...
r324 'ldir ls -lF | grep /$',
fperez
Close #64, if W. Maier confirms this fix works.
r304 # things which are executable
fperez
Update BSD fix for aliases, the previous patch was incomplete. Submitted by...
r324 'lx ls -lF | grep ^-..x',
fperez
Close #64, if W. Maier confirms this fix works.
r304 )
auto_alias = auto_alias + ls_extra
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 elif os.name in ['nt','dos']:
auto_alias = ('dir dir /on', 'ls dir /on',
'ddir dir /ad /on', 'ldir dir /ad /on',
'mkdir mkdir','rmdir rmdir','echo echo',
'ren ren','cls cls','copy copy')
else:
auto_alias = ()
fperez
Close #64, if W. Maier confirms this fix works.
r304 self.auto_alias = [s.split(None,1) for s in auto_alias]
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Call the actual (public) initializer
self.init_auto_alias()
fperez
Defaults rename, clean up api to use properties or direct access rather than...
r284
# Produce a public API instance
self.api = IPython.ipapi.IPApi(self)
# track which builtins we add, so we can clean up later
self.builtins_added = {}
# This method will add the necessary builtins for operation, but
# tracking what it did via the builtins_added dict.
self.add_builtins()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # end __init__
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 def var_expand(self,cmd,depth=0):
"""Expand python variables in a string.
The depth argument indicates how many frames above the caller should
be walked to look for the local namespace where to expand variables.
The global namespace for expansion is always the user's interactive
namespace.
"""
return str(ItplNS(cmd.replace('#','\#'),
self.user_ns, # globals
# Skip our own frame in searching for locals:
sys._getframe(depth+1).f_locals # locals
))
vivainio
pre_config_initialization added to enable using the db...
r185 def pre_config_initialization(self):
"""Pre-configuration init method
This is called before the configuration files are processed to
prepare the services the config files might need.
self.rc already has reasonable default values at this point.
"""
rc = self.rc
self.db = pickleshare.PickleShareDB(rc.ipythondir + "/db")
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 def post_config_initialization(self):
"""Post configuration init method
This is called after the configuration files have been processed to
'finalize' the initialization."""
rc = self.rc
fperez
- fix bug where aliases would shadow variables when autocall was fully off....
r299
# Object inspector
self.inspector = OInspect.Inspector(OInspect.InspectColors,
PyColorize.ANSICodeColors,
'NoColor',
rc.object_info_string_level)
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
# Load readline proper
if rc.readline:
self.init_readline()
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 # local shortcut, this is used a LOT
self.log = self.logger.log
# Initialize cache, set in/out prompts and printing system
self.outputcache = CachedOutput(self,
rc.cache_size,
rc.pprint,
input_sep = rc.separate_in,
output_sep = rc.separate_out,
output_sep2 = rc.separate_out2,
ps1 = rc.prompt_in1,
ps2 = rc.prompt_in2,
ps_out = rc.prompt_out,
pad_left = rc.prompts_pad_left)
# user may have over-ridden the default print hook:
try:
self.outputcache.__class__.display = self.hooks.display
except AttributeError:
pass
fptest
- Work around pexcept buglet which causes wraparound problems with long...
r390 # I don't like assigning globally to sys, because it means when
# embedding instances, each embedded instance overrides the previous
# choice. But sys.displayhook seems to be called internally by exec,
# so I don't see a way around it. We first save the original and then
# overwrite it.
self.sys_displayhook = sys.displayhook
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 sys.displayhook = self.outputcache
fptest
- Work around pexcept buglet which causes wraparound problems with long...
r390
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 # Set user colors (don't do it in the constructor above so that it
# doesn't crash if colors option is invalid)
self.magic_colors(rc.colors)
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 # Set calling of pdb on exceptions
self.call_pdb = rc.pdb
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59 # Load user aliases
for alias in rc.alias:
self.magic_alias(alias)
vivainio
Grand Persistence Overhaul, featuring PickleShare. startup...
r165 self.hooks.late_startup_hook()
fperez
Add Ville's patch for the new %store persistence magic.
r62
vivainio
python mybatch.ipy exits ipython immediately after...
r325 batchrun = False
vivainio
"ipython mybatch.ipy" now runs mybatch.ipy w/ _ip.runlines(), ...
r241 for batchfile in [path(arg) for arg in self.rc.args
if arg.lower().endswith('.ipy')]:
if not batchfile.isfile():
print "No such batch file:", batchfile
continue
self.api.runlines(batchfile.text())
vivainio
python mybatch.ipy exits ipython immediately after...
r325 batchrun = True
if batchrun:
self.exit_now = True
fperez
Fixes to:...
r82
def add_builtins(self):
"""Store ipython references into the builtin namespace.
Some parts of ipython operate via builtins injected here, which hold a
reference to IPython itself."""
vivainio
-Expose IPApi is _ip in user namespace....
r158 # TODO: deprecate all except _ip; 'jobs' should be installed
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 # by an extension and the rest are under _ip, ipalias is redundant
fperez
Fixes to:...
r82 builtins_new = dict(__IPYTHON__ = self,
vivainio
deprecate ipmagic, ipalias and ipsystem
r449 ip_set_hook = self.set_hook,
jobs = self.jobs,
ipmagic = wrap_deprecated(self.ipmagic,'_ip.magic()'),
ipalias = wrap_deprecated(self.ipalias),
ipsystem = wrap_deprecated(self.ipsystem,'_ip.system()'),
_ip = self.api
)
fperez
Fixes to:...
r82 for biname,bival in builtins_new.items():
try:
# store the orignal value so we can restore it
self.builtins_added[biname] = __builtin__.__dict__[biname]
except KeyError:
# or mark that it wasn't defined, and we'll just delete it at
# cleanup
self.builtins_added[biname] = Undefined
__builtin__.__dict__[biname] = bival
# Keep in the builtins a flag for when IPython is active. We set it
# with setdefault so that multiple nested IPythons don't clobber one
# another. Each will increase its value by one upon being activated,
# which also gives us a way to determine the nesting level.
__builtin__.__dict__.setdefault('__IPYTHON__active',0)
def clean_builtins(self):
"""Remove any builtins which might have been added by add_builtins, or
restore overwritten ones to their previous values."""
for biname,bival in self.builtins_added.items():
if bival is Undefined:
del __builtin__.__dict__[biname]
else:
__builtin__.__dict__[biname] = bival
self.builtins_added.clear()
fperez
Pdb calling, pickle (under certain circumstances, connected with %run) and...
r78
vivainio
First round of 'complete_command' hook, implements customizable command line ...
r394 def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """set_hook(name,hook) -> sets an internal IPython hook.
IPython exposes some of its internal API as user-modifiable hooks. By
vivainio
Hooks now implement "Chain of Command" design pattern,...
r112 adding your function to one of these hooks, you can modify IPython's
behavior to call at runtime your own routines."""
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# At some point in the future, this should validate the hook before it
# accepts it. Probably at least check that the hook takes the number
# of args it's supposed to.
vivainio
First round of 'complete_command' hook, implements customizable command line ...
r394
f = new.instancemethod(hook,self,self.__class__)
# check if the hook is for strdispatcher first
if str_key is not None:
sdp = self.strdispatchers.get(name, StrDispatch())
sdp.add_s(str_key, f, priority )
self.strdispatchers[name] = sdp
return
if re_key is not None:
sdp = self.strdispatchers.get(name, StrDispatch())
sdp.add_re(re.compile(re_key), f, priority )
self.strdispatchers[name] = sdp
return
vivainio
Hooks now implement "Chain of Command" design pattern,...
r112 dp = getattr(self.hooks, name, None)
vivainio
a = !ls, a = %alias now work (captures output or gets ret val for aliases)...
r151 if name not in IPython.hooks.__all__:
print "Warning! Hook '%s' is not one of %s" % (name, IPython.hooks.__all__ )
vivainio
Hooks now implement "Chain of Command" design pattern,...
r112 if not dp:
dp = IPython.hooks.CommandChainDispatcher()
try:
dp.add(f,priority)
except AttributeError:
# it was not commandchain, plain old func - replace
dp = f
setattr(self.hooks,name, dp)
#setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__))
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fptest
- Made the internal crash handler very customizable for end-user apps based...
r381 def set_crash_handler(self,crashHandler):
"""Set the IPython crash handler.
This must be a callable with a signature suitable for use as
sys.excepthook."""
# Install the given crash handler as the Python exception hook
sys.excepthook = crashHandler
# The instance will store a pointer to this, so that runtime code
# (such as magics) can access it. This is because during the
# read-eval loop, it gets temporarily overwritten (to deal with GUI
# frameworks).
self.sys_excepthook = sys.excepthook
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def set_custom_exc(self,exc_tuple,handler):
"""set_custom_exc(exc_tuple,handler)
Set a custom exception handler, which will be called if any of the
exceptions in exc_tuple occur in the mainloop (specifically, in the
runcode() method.
Inputs:
- exc_tuple: a *tuple* of valid exceptions to call the defined
handler for. It is very important that you use a tuple, and NOT A
LIST here, because of the way Python's except statement works. If
you only want to trap a single exception, use a singleton tuple:
exc_tuple == (MyCustomException,)
- handler: this must be defined as a function with the following
basic interface: def my_handler(self,etype,value,tb).
This will be made into an instance method (via new.instancemethod)
of IPython itself, and it will be called if any of the exceptions
listed in the exc_tuple are caught. If the handler is None, an
internal basic one is used, which just prints basic info.
WARNING: by putting in your own exception handler into IPython's main
execution loop, you run a very good chance of nasty crashes. This
facility should only be used if you really know what you are doing."""
assert type(exc_tuple)==type(()) , \
"The custom exceptions must be given AS A TUPLE."
def dummy_handler(self,etype,value,tb):
print '*** Simple custom exception handler ***'
print 'Exception type :',etype
print 'Exception value:',value
print 'Traceback :',tb
fperez
* IPython/iplib.py (runsource): remove self.code_to_run_src attribute. I...
r10 print 'Source code :','\n'.join(self.buffer)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
if handler is None: handler = dummy_handler
self.CustomTB = new.instancemethod(handler,self,self.__class__)
self.custom_exceptions = exc_tuple
def set_custom_completer(self,completer,pos=0):
"""set_custom_completer(completer,pos=0)
Adds a new custom completer function.
The position argument (defaults to 0) is the index in the completers
list where you want the completer to be inserted."""
newcomp = new.instancemethod(completer,self.Completer,
self.Completer.__class__)
self.Completer.matchers.insert(pos,newcomp)
fperez
- Various small fixes and cleanups....
r593 def set_completer(self):
"""reset readline's completer to be our own."""
self.readline.set_completer(self.Completer.complete)
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 def _get_call_pdb(self):
return self._call_pdb
def _set_call_pdb(self,val):
if val not in (0,1,False,True):
raise ValueError,'new call_pdb value must be boolean'
# store value in instance
self._call_pdb = val
# notify the actual exception handlers
self.InteractiveTB.call_pdb = val
if self.isthreaded:
try:
self.sys_excepthook.call_pdb = val
except:
warn('Failed to activate pdb for threaded exception handler')
call_pdb = property(_get_call_pdb,_set_call_pdb,None,
'Control auto-activation of pdb at exceptions')
fperez
Fixes to:...
r82
# These special functions get installed in the builtin namespace, to
# provide programmatic (pure python) access to magics, aliases and system
# calls. This is important for logging, user scripting, and more.
# We are basically exposing, via normal python functions, the three
# mechanisms in which ipython offers special call modes (magics for
# internal control, aliases for direct system access via pre-selected
# names, and !cmd for calling arbitrary system commands).
def ipmagic(self,arg_s):
"""Call a magic function by name.
Input: a string containing the name of the magic function to call and any
additional arguments to be passed to the magic.
ipmagic('name -opt foo bar') is equivalent to typing at the ipython
prompt:
In[1]: %name -opt foo bar
To call a magic without arguments, simply use ipmagic('name').
This provides a proper Python function to call IPython's magics in any
valid Python code you can type at the interpreter, including loops and
compound statements. It is added by IPython to the Python builtin
namespace upon initialization."""
args = arg_s.split(' ',1)
magic_name = args[0]
vivainio
Added ipapi, the extension api for ipython....
r109 magic_name = magic_name.lstrip(self.ESC_MAGIC)
fperez
Fixes to:...
r82 try:
magic_args = args[1]
except IndexError:
magic_args = ''
fn = getattr(self,'magic_'+magic_name,None)
if fn is None:
error("Magic function `%s` not found." % magic_name)
else:
fptest
Fix namespace handling for magics and shell escapes in function definitions.
r417 magic_args = self.var_expand(magic_args,1)
fperez
Fixes to:...
r82 return fn(magic_args)
def ipalias(self,arg_s):
"""Call an alias by name.
Input: a string containing the name of the alias to call and any
additional arguments to be passed to the magic.
ipalias('name -opt foo bar') is equivalent to typing at the ipython
prompt:
In[1]: name -opt foo bar
To call an alias without arguments, simply use ipalias('name').
This provides a proper Python function to call IPython's aliases in any
valid Python code you can type at the interpreter, including loops and
compound statements. It is added by IPython to the Python builtin
namespace upon initialization."""
args = arg_s.split(' ',1)
alias_name = args[0]
try:
alias_args = args[1]
except IndexError:
alias_args = ''
if alias_name in self.alias_table:
self.call_alias(alias_name,alias_args)
else:
error("Alias `%s` not found." % alias_name)
def ipsystem(self,arg_s):
"""Make a system call, using IPython."""
fperez
fix tab-completion bug in embedded ipython reported by Arnd
r89
fperez
Fixes to:...
r82 self.system(arg_s)
fperez
Added .complete() method to ipython. This exposes the attribute completion...
r16 def complete(self,text):
"""Return a sorted list of all possible completions on text.
Inputs:
- text: a string of text to be completed on.
This is a wrapper around the completion mechanism, similar to what
readline does at the command line when the TAB key is hit. By
exposing it as a method, it can be used by other non-readline
environments (such as GUIs) for text completion.
Simple usage example:
In [1]: x = 'hello'
In [2]: __IP.complete('x.l')
Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']"""
complete = self.Completer.complete
state = 0
# use a dict so we get unique keys, since ipyhton's multiple
fperez
- Close #109, completion works also when not called by readline.
r583 # completers can return duplicates. When we make 2.4 a requirement,
# start using sets instead, which are faster.
fperez
Added .complete() method to ipython. This exposes the attribute completion...
r16 comps = {}
while True:
fperez
- Close #109, completion works also when not called by readline.
r583 newcomp = complete(text,state,line_buffer=text)
fperez
Added .complete() method to ipython. This exposes the attribute completion...
r16 if newcomp is None:
break
comps[newcomp] = 1
state += 1
outcomps = comps.keys()
outcomps.sort()
return outcomps
fperez
- Fairly significant changes to include Vivian's patches for improved pdb...
r46
fperez
fix tab-completion bug in embedded ipython reported by Arnd
r89 def set_completer_frame(self, frame=None):
fperez
- Fairly significant changes to include Vivian's patches for improved pdb...
r46 if frame:
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47 self.Completer.namespace = frame.f_locals
self.Completer.global_namespace = frame.f_globals
fperez
- Fairly significant changes to include Vivian's patches for improved pdb...
r46 else:
self.Completer.namespace = self.user_ns
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47 self.Completer.global_namespace = self.user_global_ns
fperez
Added .complete() method to ipython. This exposes the attribute completion...
r16
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def init_auto_alias(self):
"""Define some aliases automatically.
These are ALL parameter-less aliases"""
fperez
fix tab-completion bug in embedded ipython reported by Arnd
r89
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 for alias,cmd in self.auto_alias:
self.alias_table[alias] = (0,cmd)
def alias_table_validate(self,verbose=0):
"""Update information about the alias table.
In particular, make sure no Python keywords/builtins are in it."""
no_alias = self.no_alias
fperez
Minor fixes in genutils, and a BIG fix for threading. I _think_ I got...
r20 for k in self.alias_table.keys():
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if k in no_alias:
del self.alias_table[k]
if verbose:
print ("Deleting alias <%s>, it's a Python "
"keyword or builtin." % k)
def set_autoindent(self,value=None):
"""Set the autoindent flag, checking for readline support.
If called with no arguments, it acts as a toggle."""
if not self.has_readline:
if os.name == 'posix':
warn("The auto-indent feature requires the readline library")
self.autoindent = 0
return
if value is None:
self.autoindent = not self.autoindent
else:
self.autoindent = value
def rc_set_toggle(self,rc_field,value=None):
"""Set or toggle a field in IPython's rc config. structure.
If called with no arguments, it acts as a toggle.
If called with a non-existent field, the resulting AttributeError
exception will propagate out."""
rc_val = getattr(self.rc,rc_field)
if value is None:
value = not rc_val
setattr(self.rc,rc_field,value)
def user_setup(self,ipythondir,rc_suffix,mode='install'):
"""Install the user configuration directory.
Can be called when running for the first time or to upgrade the user's
.ipython/ directory with the mode parameter. Valid modes are 'install'
and 'upgrade'."""
def wait():
try:
raw_input("Please press <RETURN> to start IPython.")
except EOFError:
print >> Term.cout
print '*'*70
cwd = os.getcwd() # remember where we started
glb = glob.glob
print '*'*70
if mode == 'install':
print \
"""Welcome to IPython. I will try to create a personal configuration directory
where you can customize many aspects of IPython's functionality in:\n"""
else:
print 'I am going to upgrade your configuration in:'
print ipythondir
rcdirend = os.path.join('IPython','UserConfig')
cfg = lambda d: os.path.join(d,rcdirend)
try:
rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]
except IOError:
warning = """
Installation error. IPython's directory was not found.
Check the following:
The ipython/IPython directory should be in a directory belonging to your
PYTHONPATH environment variable (that is, it should be in a directory
belonging to sys.path). You can copy it explicitly there or just link to it.
IPython will proceed with builtin defaults.
"""
warn(warning)
wait()
return
if mode == 'install':
try:
shutil.copytree(rcdir,ipythondir)
os.chdir(ipythondir)
rc_files = glb("ipythonrc*")
for rc_file in rc_files:
os.rename(rc_file,rc_file+rc_suffix)
except:
warning = """
There was a problem with the installation:
%s
Try to correct it or contact the developers if you think it's a bug.
IPython will proceed with builtin defaults.""" % sys.exc_info()[1]
warn(warning)
wait()
return
elif mode == 'upgrade':
try:
os.chdir(ipythondir)
except:
print """
Can not upgrade: changing to directory %s failed. Details:
%s
""" % (ipythondir,sys.exc_info()[1])
wait()
return
else:
sources = glb(os.path.join(rcdir,'[A-Za-z]*'))
for new_full_path in sources:
new_filename = os.path.basename(new_full_path)
if new_filename.startswith('ipythonrc'):
new_filename = new_filename + rc_suffix
# The config directory should only contain files, skip any
# directories which may be there (like CVS)
if os.path.isdir(new_full_path):
continue
if os.path.exists(new_filename):
old_file = new_filename+'.old'
if os.path.exists(old_file):
os.remove(old_file)
os.rename(new_filename,old_file)
shutil.copy(new_full_path,new_filename)
else:
raise ValueError,'unrecognized mode for install:',`mode`
# Fix line-endings to those native to each platform in the config
# directory.
try:
os.chdir(ipythondir)
except:
print """
Problem: changing to directory %s failed.
Details:
%s
Some configuration files may have incorrect line endings. This should not
cause any problems during execution. """ % (ipythondir,sys.exc_info()[1])
wait()
else:
for fname in glb('ipythonrc*'):
try:
native_line_ends(fname,backup=0)
except IOError:
pass
if mode == 'install':
print """
Successful installation!
Please read the sections 'Initial Configuration' and 'Quick Tips' in the
IPython manual (there are both HTML and PDF versions supplied with the
distribution) to make sure that your system environment is properly configured
vivainio
Changed startup message, and be a bit more conservative with the settings
r131 to take advantage of IPython's features.
Important note: the configuration system has changed! The old system is
still in place, but its setting may be partly overridden by the settings in
"~/.ipython/ipy_user_conf.py" config file. Please take a look at the file
if some of the new settings bother you.
"""
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
print """
Successful upgrade!
All files in your directory:
%(ipythondir)s
which would have been overwritten by the upgrade were backed up with a .old
extension. If you had made particular customizations in those files you may
want to merge them back into the new files.""" % locals()
wait()
os.chdir(cwd)
# end user_setup()
def atexit_operations(self):
"""This will be executed at the time of exit.
Saving of persistent data should be performed here. """
fperez
%autocall fixes...
r106 #print '*** IPython exit cleanup ***' # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # input history
self.savehist()
# Cleanup all tempfiles left around
for tfile in self.tempfiles:
try:
os.unlink(tfile)
except OSError:
pass
# save the "persistent data" catch-all dictionary
vivainio
Grand Persistence Overhaul, featuring PickleShare. startup...
r165 self.hooks.shutdown_hook()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def savehist(self):
"""Save input history to a file (via readline library)."""
try:
self.readline.write_history_file(self.histfile)
except:
print 'Unable to save IPython command history to file: ' + \
`self.histfile`
jdh2358
- Final commits for 0.8.0 tag....
r595 def reloadhist(self):
"""Reload the input history from disk file."""
if self.has_readline:
self.readline.clear_history()
self.readline.read_history_file(self.shell.histfile)
vivainio
use history_saving_wrapper to store/restore readline history
r408 def history_saving_wrapper(self, func):
""" Wrap func for readline history saving
Convert func into callable that saves & restores
history around the call """
if not self.has_readline:
return func
def wrapper():
self.savehist()
try:
func()
finally:
readline.read_history_file(self.histfile)
return wrapper
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def pre_readline(self):
"""readline hook to be used at the start of each line.
Currently it handles auto-indent only."""
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53
vivainio
Merged 1071-1076 from banches/0.7.1
r145 #debugx('self.indent_current_nsp','pre_readline:')
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125 self.readline.insert_text(self.indent_current_str())
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def init_readline(self):
"""Command history completion/saving/reloading."""
vivainio
provide single readline config place through rlineimpl
r161
import IPython.rlineimpl as readline
if not readline.have_readline:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.has_readline = 0
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.readline = None
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # no point in bugging windows users with this every time:
vivainio
Try to import pyreadline on win32
r160 warn('Readline services not available on this platform.')
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
vivainio
provide single readline config place through rlineimpl
r161 sys.modules['readline'] = readline
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 import atexit
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 from IPython.completer import IPCompleter
self.Completer = IPCompleter(self,
self.user_ns,
self.user_global_ns,
self.rc.readline_omit__names,
self.alias_table)
vivainio
First round of 'complete_command' hook, implements customizable command line ...
r394 sdisp = self.strdispatchers.get('complete_command', StrDispatch())
self.strdispatchers['complete_command'] = sdisp
self.Completer.custom_completers = sdisp
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Platform-specific configuration
if os.name == 'nt':
self.readline_startup_hook = readline.set_pre_input_hook
else:
self.readline_startup_hook = readline.set_startup_hook
# Load user's initrc file (readline config)
inputrc_name = os.environ.get('INPUTRC')
if inputrc_name is None:
home_dir = get_home_dir()
if home_dir is not None:
inputrc_name = os.path.join(home_dir,'.inputrc')
if os.path.isfile(inputrc_name):
try:
readline.read_init_file(inputrc_name)
except:
warn('Problems reading readline initialization file <%s>'
% inputrc_name)
self.has_readline = 1
self.readline = readline
# save this in sys so embedded copies can restore it properly
sys.ipcompleter = self.Completer.complete
fperez
- Various small fixes and cleanups....
r593 self.set_completer()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# Configure readline according to user's prefs
for rlcommand in self.rc.readline_parse_and_bind:
readline.parse_and_bind(rlcommand)
# remove some chars from the delimiters list
delims = readline.get_completer_delims()
delims = delims.translate(string._idmap,
self.rc.readline_remove_delims)
readline.set_completer_delims(delims)
# otherwise we end up with a monster history after a while:
readline.set_history_length(1000)
try:
#print '*** Reading readline history' # dbg
readline.read_history_file(self.histfile)
except IOError:
pass # It doesn't exist yet.
atexit.register(self.atexit_operations)
del atexit
# Configure auto-indent for all platforms
self.set_autoindent(self.rc.autoindent)
vivainio
added 'quiet' option
r323 def ask_yes_no(self,prompt,default=True):
if self.rc.quiet:
return True
return ask_yes_no(prompt,default)
fperez
Added support for automatically reopening the editor if the file had a...
r54 def _should_recompile(self,e):
"""Utility routine for edit_syntax_error"""
fperez
Fix GTK timer/idle problems, finally.
r95
fperez
Added support for automatically reopening the editor if the file had a...
r54 if e.filename in ('<ipython console>','<input>','<string>',
fperez
- add support for PyCrust-style _getAttributeNames magic method. Closes #50....
r292 '<console>','<BackgroundJob compilation>',
None):
vivainio
Prettified and hardened string/backslash quoting with ipsystem(), ipalias() and ...
r100
fperez
Added support for automatically reopening the editor if the file had a...
r54 return False
try:
vivainio
Fixed autoedit_syntax == 2 idiocy
r172 if (self.rc.autoedit_syntax and
vivainio
added 'quiet' option
r323 not self.ask_yes_no('Return to editor to correct syntax error? '
vivainio
-Expose IPApi is _ip in user namespace....
r158 '[Y/n] ','y')):
fperez
Added support for automatically reopening the editor if the file had a...
r54 return False
except EOFError:
return False
fperez
Small fix in ultraTB, and fix autocall....
r88
def int0(x):
try:
return int(x)
except TypeError:
return 0
# always pass integer line and offset values to editor hook
self.hooks.fix_error_editor(e.filename,
int0(e.lineno),int0(e.offset),e.msg)
fperez
Added support for automatically reopening the editor if the file had a...
r54 return True
def edit_syntax_error(self):
"""The bottom half of the syntax error handler called in the main loop.
Loop until syntax error is fixed or user cancels.
"""
while self.SyntaxTB.last_syntax_error:
# copy and clear last_syntax_error
err = self.SyntaxTB.clear_err_state()
if not self._should_recompile(err):
return
try:
# may set last_syntax_error again if a SyntaxError is raised
fperez
small name cleanup
r319 self.safe_execfile(err.filename,self.user_ns)
fperez
Added support for automatically reopening the editor if the file had a...
r54 except:
self.showtraceback()
else:
try:
fperez
- add support for PyCrust-style _getAttributeNames magic method. Closes #50....
r292 f = file(err.filename)
try:
sys.displayhook(f.read())
finally:
f.close()
except:
self.showtraceback()
fperez
Added support for automatically reopening the editor if the file had a...
r54
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def showsyntaxerror(self, filename=None):
"""Display the syntax error that just occurred.
This doesn't display a stack trace because there isn't one.
If a filename is given, it is stuffed in the exception instead
of what was there before (because Python's parser always uses
"<string>" when reading from a string).
"""
fperez
- thread-safety fixes...
r69 etype, value, last_traceback = sys.exc_info()
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216
# See note about these variables in showtraceback() below
sys.last_type = etype
sys.last_value = value
sys.last_traceback = last_traceback
fperez
- thread-safety fixes...
r69 if filename and etype is SyntaxError:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Work hard to stuff the correct filename in the exception
try:
msg, (dummy_filename, lineno, offset, line) = value
except:
# Not the format we expect; leave it alone
pass
else:
# Stuff in the right filename
try:
# Assume SyntaxError is a class exception
value = SyntaxError(msg, (filename, lineno, offset, line))
except:
# If that failed, assume SyntaxError is a string
value = msg, (filename, lineno, offset, line)
fperez
- thread-safety fixes...
r69 self.SyntaxTB(etype,value,[])
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Add new %debug magic, activates the interactive debugger immediately on the...
r470 def debugger(self,force=False):
"""Call the pydb/pdb debugger.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Add new %debug magic, activates the interactive debugger immediately on the...
r470 Keywords:
- force(False): by default, this routine checks the instance call_pdb
flag and does not actually invoke the debugger if the flag is false.
The 'force' option forces the debugger to activate even if the flag
is false.
"""
if not (force or self.call_pdb):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return
fperez
Add new %debug magic, activates the interactive debugger immediately on the...
r470
fperez
Prevent a nasty traceback if %debug is called before any exception has occurred.
r491 if not hasattr(sys,'last_traceback'):
error('No traceback has been produced, nothing to debug.')
return
vivainio
rocky's pydb patch \#4
r475 # use pydb if available
fperez
Prevent %debug from not working if pydb 1.17 is installed, which has a fatal bug
r587 if Debugger.has_pydb:
vivainio
rocky's pydb patch \#4
r475 from pydb import pm
fperez
Prevent %debug from not working if pydb 1.17 is installed, which has a fatal bug
r587 else:
fperez
Add new %debug magic, activates the interactive debugger immediately on the...
r470 # fallback to our internal debugger
pm = lambda : self.InteractiveTB.debugger(force=True)
vivainio
use history_saving_wrapper to store/restore readline history
r408 self.history_saving_wrapper(pm)()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None):
fperez
- add support for PyCrust-style _getAttributeNames magic method. Closes #50....
r292 """Display the exception that just occurred.
If nothing is known about the exception, this is the method which
should be used throughout the code for presenting user tracebacks,
walter.doerwald
Fix typo.
r293 rather than directly invoking the InteractiveTB object.
fperez
- add support for PyCrust-style _getAttributeNames magic method. Closes #50....
r292
A specific showsyntaxerror() also exists, but this method can take
care of calling it if needed, so unless you are explicitly catching a
SyntaxError exception, don't try to analyze the stack manually and
simply call this method."""
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
vivainio
Do not crash when running w/o readline
r601
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Though this won't be called by syntax errors in the input line,
# there may be SyntaxError cases whith imported code.
vivainio
Do not crash when running w/o readline
r601
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if exc_tuple is None:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 etype, value, tb = sys.exc_info()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 etype, value, tb = exc_tuple
fperez
Add support for set_trace-like functionality, but with IPython's enhanced...
r506
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 if etype is SyntaxError:
fperez
New demo class, very handy for interactive presentations.
r22 self.showsyntaxerror(filename)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 # WARNING: these variables are somewhat deprecated and not
# necessarily safe to use in a threaded environment, but tools
# like pdb depend on their existence, so let's set them. If we
# find problems in the field, we'll need to revisit their use.
sys.last_type = etype
sys.last_value = value
sys.last_traceback = tb
fperez
Add support for set_trace-like functionality, but with IPython's enhanced...
r506
if etype in self.custom_exceptions:
self.CustomTB(etype,value,tb)
else:
self.InteractiveTB(etype,value,tb,tb_offset=tb_offset)
if self.InteractiveTB.call_pdb and self.has_readline:
# pdb mucks up readline, fix it back
fperez
- Various small fixes and cleanups....
r593 self.set_completer()
vivainio
Do not crash when running w/o readline
r601
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def mainloop(self,banner=None):
"""Creates the local namespace and starts the mainloop.
If an optional banner argument is given, it will override the
internally created default banner."""
fperez
- Fix problems with -pylab and custom namespaces....
r296
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if self.rc.c: # Emulate Python's -c option
self.exec_init_cmd()
if banner is None:
vivainio
easy_install ipython==dev works correctly now...
r176 if not self.rc.banner:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 banner = ''
vivainio
easy_install ipython==dev works correctly now...
r176 # banner is string? Use it directly!
elif isinstance(self.rc.banner,basestring):
banner = self.rc.banner
else:
banner = self.BANNER+self.banner2
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.interact(banner)
def exec_init_cmd(self):
"""Execute a command given at the command line.
This emulates Python's -c option."""
vivainio
Do not change sys.argv to ['-c'] on "-c cmd" command line option.
r153 #sys.argv = ['-c']
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.push(self.rc.c)
def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0):
"""Embeds IPython into a running python program.
Input:
- header: An optional header message can be specified.
- local_ns, global_ns: working namespaces. If given as None, the
IPython-initialized one is updated with __main__.__dict__, so that
program variables become visible but user-specific configuration
remains possible.
- stack_depth: specifies how many levels in the stack to go to
looking for namespaces (when local_ns and global_ns are None). This
allows an intermediate caller to make sure that this function gets
the namespace from the intended level in the stack. By default (0)
it will get its locals and globals from the immediate caller.
Warning: it's possible to use this in a program which is being run by
IPython itself (via %run), but some funny things will happen (a few
globals get overwritten). In the future this will be cleaned up, as
there is no fundamental reason why it can't work perfectly."""
# Get locals and globals from caller
if local_ns is None or global_ns is None:
call_frame = sys._getframe(stack_depth).f_back
if local_ns is None:
local_ns = call_frame.f_locals
if global_ns is None:
global_ns = call_frame.f_globals
# Update namespaces and fire up interpreter
fperez
Fixes to:...
r82
# The global one is easy, we can just throw it in
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 self.user_global_ns = global_ns
fperez
Fixes to:...
r82 # but the user/local one is tricky: ipython needs it to store internal
# data, but we also need the locals. We'll copy locals in the user
# one, but will track what got copied so we can delete them at exit.
# This is so that a later embedded call doesn't see locals from a
# previous call (which most likely existed in a separate scope).
local_varnames = local_ns.keys()
self.user_ns.update(local_ns)
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 # Patch for global embedding to make sure that things don't overwrite
# user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
# FIXME. Test this a bit more carefully (the if.. is new)
if local_ns is None and global_ns is None:
self.user_global_ns.update(__main__.__dict__)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47 # make sure the tab-completer has the correct frame information, so it
# actually completes using the frame's locals/globals
fperez
fix tab-completion bug in embedded ipython reported by Arnd
r89 self.set_completer_frame()
fperez
Fixes to:...
r82
# before activating the interactive mode, we need to make sure that
# all names in the builtin namespace needed by ipython point to
# ourselves, and not to other instances.
self.add_builtins()
fperez
Namespace fixes for embedded instances, as well as tab-complete enhancements...
r47
fperez
Fixes for handling of global variables in embedded ipython instances (I ran...
r39 self.interact(header)
fperez
Fixes to:...
r82
# now, purge out the user namespace from anything we might have added
# from the caller's local namespace
delvar = self.user_ns.pop
for var in local_varnames:
delvar(var,None)
# and clean builtins we may have overridden
self.clean_builtins()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def interact(self, banner=None):
"""Closely emulate the interactive Python console.
The optional banner argument specify the banner to print
before the first interaction; by default it prints a banner
similar to the one printed by the real Python interpreter,
followed by the current class name in parentheses (so as not
to confuse this with the real interpreter -- since it's so
close!).
"""
vivainio
python mybatch.ipy exits ipython immediately after...
r325
if self.exit_now:
# batch run -> do not interact
return
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 cprt = 'Type "copyright", "credits" or "license" for more information.'
if banner is None:
self.write("Python %s on %s\n%s\n(%s)\n" %
(sys.version, sys.platform, cprt,
self.__class__.__name__))
else:
self.write(banner)
more = 0
fperez
- Fairly significant changes to include Vivian's patches for improved pdb...
r46
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Mark activity in the builtins
__builtin__.__dict__['__IPYTHON__active'] += 1
fperez
Unicode fixes (utf-8 used by default if ascii is not enough). This should fix some reported crashes....
r5
# exit_now is set by a call to %Exit or %Quit
while not self.exit_now:
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 if more:
vivainio
generate_prompt hook...
r330 prompt = self.hooks.generate_prompt(True)
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 if self.autoindent:
self.readline_startup_hook(self.pre_readline)
else:
vivainio
generate_prompt hook...
r330 prompt = self.hooks.generate_prompt(False)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 try:
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 line = self.raw_input(prompt,more)
vivainio
Return ValueError catching to raw_input to (kinda) fix sys.stdin.close()i
r370 if self.exit_now:
# quick exit on sys.std[in|out] close
break
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 if self.autoindent:
self.readline_startup_hook(None)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except KeyboardInterrupt:
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 self.write('\nKeyboardInterrupt\n')
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.resetbuffer()
# keep cache in sync with the prompt counter:
self.outputcache.prompt_count -= 1
if self.autoindent:
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 self.indent_current_nsp = 0
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 more = 0
except EOFError:
if self.autoindent:
self.readline_startup_hook(None)
self.write('\n')
self.exit()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except bdb.BdbQuit:
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163 warn('The Python debugger has exited with a BdbQuit exception.\n'
'Because of how pdb handles the stack, it is impossible\n'
'for IPython to properly format this particular exception.\n'
'IPython will resume normal operation.')
except:
# exceptions here are VERY RARE, but they can be triggered
# asynchronously by signal handlers, for example.
self.showtraceback()
else:
more = self.push(line)
if (self.SyntaxTB.last_syntax_error and
self.rc.autoedit_syntax):
self.edit_syntax_error()
fperez
Unicode fixes (utf-8 used by default if ascii is not enough). This should fix some reported crashes....
r5
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # We are off again...
__builtin__.__dict__['__IPYTHON__active'] -= 1
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 def excepthook(self, etype, value, tb):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """One more defense for GUI apps that call sys.excepthook.
GUI frameworks like wxPython trap exceptions and call
sys.excepthook themselves. I guess this is a feature that
enables them to keep running after exceptions that would
otherwise kill their mainloop. This is a bother for IPython
which excepts to catch all of the program exceptions with a try:
except: statement.
Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
any app directly invokes sys.excepthook, it will look to the user like
IPython crashed. In order to work around this, we can disable the
CrashHandler and replace it with this excepthook instead, which prints a
regular traceback using our InteractiveTB. In this fashion, apps which
call sys.excepthook will generate a regular-looking exception from
IPython, and the CrashHandler will only be triggered by real IPython
crashes.
This hook should be used sparingly, only in places which are not likely
to be true IPython errors.
"""
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 self.showtraceback((etype,value,tb),tb_offset=0)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
vivainio
Aliases are no transitive, i.e. expand recursively
r374 def expand_aliases(self,fn,rest):
""" Expand multiple levels of aliases:
if:
alias foo bar /tmp
alias baz foo
then:
baz huhhahhei -> bar /tmp huhhahhei
"""
line = fn + " " + rest
vivainio
prevent cyclic alias definitions
r377
done = Set()
vivainio
Aliases are no transitive, i.e. expand recursively
r374 while 1:
vivainio
split_user_input users different pattern for splitting in alias expansion
r569 pre,fn,rest = self.split_user_input(line, pattern = self.shell_line_split)
# print "!",fn,"!",rest # dbg
vivainio
Aliases are no transitive, i.e. expand recursively
r374 if fn in self.alias_table:
vivainio
prevent cyclic alias definitions
r377 if fn in done:
warn("Cyclic alias definition, repeated '%s'" % fn)
return ""
done.add(fn)
vivainio
Aliases are no transitive, i.e. expand recursively
r374 l2 = self.transform_alias(fn,rest)
vivainio
break infinite recursion on 'ls -> ls -F' alias and the like
r376 # dir -> dir
vivainio
do not attempt custom completers on empty line
r399 # print "alias",line, "->",l2 #dbg
vivainio
Aliases are no transitive, i.e. expand recursively
r374 if l2 == line:
break
vivainio
break infinite recursion on 'ls -> ls -F' alias and the like
r376 # ls -> ls -F should not recurse forever
if l2.split(None,1)[0] == line.split(None,1)[0]:
line = l2
break
line=l2
vivainio
Aliases are no transitive, i.e. expand recursively
r374 # print "al expand to",line #dbg
else:
break
return line
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 def transform_alias(self, alias,rest=''):
fperez
fix crash with missing profiles
r316 """ Transform alias to system command string.
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 """
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 nargs,cmd = self.alias_table[alias]
vivainio
Fix quoting of aliases in transform_alias
r239 if ' ' in cmd and os.path.isfile(cmd):
vivainio
Quote aliases w/ spaces in target name...
r235 cmd = '"%s"' % cmd
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Expand the %l special to be the user's input line
if cmd.find('%l') >= 0:
cmd = cmd.replace('%l',rest)
rest = ''
if nargs==0:
# Simple, argument-less aliases
cmd = '%s %s' % (cmd,rest)
else:
# Handle aliases with positional arguments
args = rest.split(None,nargs)
if len(args)< nargs:
error('Alias <%s> requires %s arguments, %s given.' %
(alias,nargs,len(args)))
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 return None
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:]))
# Now call the macro, evaluating in the user's namespace
fperez
fix crash with missing profiles
r316 #print 'new command: <%r>' % cmd # dbg
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 return cmd
def call_alias(self,alias,rest=''):
"""Call an alias given its name and the rest of the line.
This is only used to provide backwards compatibility for users of
ipalias(), use of which is not recommended for anymore."""
# Now call the macro, evaluating in the user's namespace
cmd = self.transform_alias(alias, rest)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 try:
self.system(cmd)
except:
self.showtraceback()
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125 def indent_current_str(self):
"""return the current level of indentation as a string"""
return self.indent_current_nsp * ' '
fperez
- thread-safety fixes...
r69 def autoindent_update(self,line):
"""Keep track of the indent level."""
fperez
%autocall fixes...
r106
vivainio
Merged 1071-1076 from banches/0.7.1
r145 #debugx('line')
#debugx('self.indent_current_nsp')
fperez
- thread-safety fixes...
r69 if self.autoindent:
if line:
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125 inisp = num_ini_spaces(line)
if inisp < self.indent_current_nsp:
self.indent_current_nsp = inisp
fperez
- thread-safety fixes...
r69
if line[-1] == ':':
self.indent_current_nsp += 4
elif dedent_re.match(line):
self.indent_current_nsp -= 4
else:
self.indent_current_nsp = 0
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def runlines(self,lines):
"""Run a string of one or more lines of source.
This method is capable of running a string containing multiple source
lines, as if they had been entered at the IPython prompt. Since it
exposes IPython's processing machinery, the given strings can contain
magic calls (%magic), special shell access (!cmd), etc."""
# We must start with a clean buffer, in case this is run from an
# interactive IPython session (via a magic, for example).
self.resetbuffer()
lines = lines.split('\n')
more = 0
for line in lines:
# skip blank lines so we don't mess up the prompt counter, but do
# NOT skip even a blank line if we are in a code block (more is
# true)
if line or more:
fperez
- Fix autoindent which I had broken......
r72 more = self.push(self.prefilter(line,more))
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # IPython's runsource returns None if there was an error
# compiling the code. This allows us to stop processing right
# away, so the user gets the error message at the right place.
if more is None:
break
# final newline in case the input didn't have it, so that the code
# actually does get executed
if more:
self.push('\n')
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 def runsource(self, source, filename='<input>', symbol='single'):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """Compile and run some source in the interpreter.
Arguments are as for compile_command().
One several things can happen:
1) The input is incorrect; compile_command() raised an
exception (SyntaxError or OverflowError). A syntax traceback
will be printed by calling the showsyntaxerror() method.
2) The input is incomplete, and more input is required;
compile_command() returned None. Nothing happens.
3) The input is complete; compile_command() returned a code
object. The code is executed by calling self.runcode() (which
also handles run-time exceptions, except for SystemExit).
The return value is:
- True in case 2
- False in the other cases, unless an exception is raised, where
None is returned instead. This can be used by external callers to
know whether to continue feeding input or not.
The return value can be used to decide whether to use sys.ps1 or
sys.ps2 to prompt the next line."""
fperez
* IPython/iplib.py (runsource): remove self.code_to_run_src attribute. I...
r10
fperez
- Automatically prepend 'if 1:' to user input that starts with whitespace,...
r420 # if the source code has leading blanks, add 'if 1:\n' to it
# this allows execution of indented pasted code. It is tempting
# to add '\n' at the end of source to run commands like ' a=1'
# directly, but this fails for more complicated scenarios
if source[:1] in [' ', '\t']:
source = 'if 1:\n%s' % source
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 try:
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 code = self.compile(source,filename,symbol)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except (OverflowError, SyntaxError, ValueError):
# Case 1
self.showsyntaxerror(filename)
return None
if code is None:
# Case 2
return True
# Case 3
fperez
* IPython/iplib.py (runsource): remove self.code_to_run_src attribute. I...
r10 # We store the code object so that threaded shells and
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # custom exception handlers can access all this info if needed.
fperez
* IPython/iplib.py (runsource): remove self.code_to_run_src attribute. I...
r10 # The source corresponding to this can be obtained from the
# buffer attribute as '\n'.join(self.buffer).
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.code_to_run = code
# now actually execute the code object
if self.runcode(code) == 0:
return False
else:
return None
def runcode(self,code_obj):
"""Execute a code object.
When an exception occurs, self.showtraceback() is called to display a
traceback.
Return value: a flag indicating whether the code to be run completed
successfully:
- 0: successful execution.
- 1: an error occurred.
"""
# Set our own excepthook in case the user code tries to call it
# directly, so that the IPython crash handler doesn't get triggered
old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
fperez
pdb support in threaded mode, replaced the crash handler with a verbose...
r59
# we save the original sys.excepthook in the instance, in case config
# code (such as magics) needs access to it.
self.sys_excepthook = old_excepthook
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 outflag = 1 # happens in more places, so it's easier as default
try:
try:
fperez
Wildcard system cleanup, ipmaker speedups, bugfix in globals handling...
r41 # Embedded instances require separate global/local namespaces
# so they can see both the surrounding (local) namespace and
# the module-level globals when called inside another function.
if self.embedded:
exec code_obj in self.user_global_ns, self.user_ns
# Normal (non-embedded) instances should only have a single
# namespace for user code execution, otherwise functions won't
# see interactive top-level globals.
else:
exec code_obj in self.user_ns
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 finally:
# Reset our crash handler in place
sys.excepthook = old_excepthook
except SystemExit:
self.resetbuffer()
self.showtraceback()
vivainio
do not crash on exit() with py2.5
r366 warn("Type %exit or %quit to exit IPython "
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 "(%Exit or %Quit do so unconditionally).",level=1)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except self.custom_exceptions:
etype,value,tb = sys.exc_info()
self.CustomTB(etype,value,tb)
except:
self.showtraceback()
else:
outflag = 0
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 if softspace(sys.stdout, 0):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 print
# Flush out code object which has been run (and source)
self.code_to_run = None
return outflag
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51
def push(self, line):
"""Push a line to the interpreter.
The line should not have a trailing newline; it may have
internal newlines. The line is appended to a buffer and the
interpreter's runsource() method is called with the
concatenated contents of the buffer as source. If this
indicates that the command was executed or invalid, the buffer
is reset; otherwise, the command is incomplete, and the buffer
is left as it was after the line was appended. The return
value is 1 if more input is required, 0 if the line was dealt
with in some way (this is the same as runsource()).
"""
fperez
- Fix autoindent which I had broken......
r72
# autoindent management should be done here, and not in the
# interactive loop, since that one is only seen by keyboard input. We
# need this done correctly even for code run via runlines (which uses
# push).
fperez
fix handling of aliases/system calls for multiline input
r76
fperez
clean leftover debug info
r77 #print 'push line: <%s>' % line # dbg
vivainio
Jorgen Cederlof's patch for storing multiline history entries...
r353 for subline in line.splitlines():
self.autoindent_update(subline)
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.buffer.append(line)
fperez
Cosmetic cleanups: put all imports in a single line, and sort them...
r52 more = self.runsource('\n'.join(self.buffer), self.filename)
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 if not more:
self.resetbuffer()
return more
def resetbuffer(self):
"""Reset the input buffer."""
self.buffer[:] = []
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125
fperez
Indentation improvements: ...
r50 def raw_input(self,prompt='',continue_prompt=False):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """Write a prompt and read a line.
The returned line does not include the trailing newline.
When the user enters the EOF key sequence, EOFError is raised.
fperez
Indentation improvements: ...
r50 Optional inputs:
- prompt(''): a string to be printed to prompt the user.
- continue_prompt(False): whether this line is the first one or a
continuation in a sequence of inputs.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """
fperez
Indentation improvements: ...
r50
fperez
- Various small fixes and cleanups....
r593 # Code run by the user may have modified the readline completer state.
# We must ensure that our completer is back in place.
vivainio
Do not crash when running w/o readline
r601 if self.has_readline:
self.set_completer()
fperez
- Various small fixes and cleanups....
r593
vivainio
Return ValueError catching to raw_input to (kinda) fix sys.stdin.close()i
r370 try:
jdh2358
- Final commits for 0.8.0 tag....
r595 line = raw_input_original(prompt).decode(self.stdin_encoding)
vivainio
Return ValueError catching to raw_input to (kinda) fix sys.stdin.close()i
r370 except ValueError:
fperez
- Various small fixes and cleanups....
r593 warn("\n********\nYou or a %run:ed script called sys.stdin.close()"
" or sys.stdout.close()!\nExiting IPython!")
vivainio
Return ValueError catching to raw_input to (kinda) fix sys.stdin.close()i
r370 self.exit_now = True
return ""
fperez
Fix KeyboardInterrupt trapping (Ctrl-C), which I think I recently broke.
r163
fperez
Indentation improvements: ...
r50 # Try to be reasonably smart about not re-indenting pasted input more
# than necessary. We do this by trimming out the auto-indent initial
# spaces, if the user's actual input started itself with whitespace.
vivainio
Merged 1071-1076 from banches/0.7.1
r145 #debugx('self.buffer[-1]')
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125
if self.autoindent:
if num_ini_spaces(line) > self.indent_current_nsp:
line = line[self.indent_current_nsp:]
self.indent_current_nsp = 0
vivainio
Merged 1071-1076 from banches/0.7.1
r145 # store the unfiltered input before the user has any chance to modify
# it.
if line.strip():
if continue_prompt:
self.input_hist_raw[-1] += '%s\n' % line
vivainio
Jorgen Cederlof's patch for storing multiline history entries...
r353 if self.has_readline: # and some config option is set?
try:
histlen = self.readline.get_current_history_length()
newhist = self.input_hist_raw[-1].rstrip()
self.readline.remove_history_item(histlen-1)
self.readline.replace_history_item(histlen-2,newhist)
except AttributeError:
pass # re{move,place}_history_item are new in 2.4.
vivainio
Merged 1071-1076 from banches/0.7.1
r145 else:
self.input_hist_raw.append('%s\n' % line)
fperez
- add support for PyCrust-style _getAttributeNames magic method. Closes #50....
r292 try:
lineout = self.prefilter(line,continue_prompt)
except:
# blanket except, in case a user-defined prefilter crashes, so it
# can't take all of ipython with it.
self.showtraceback()
fperez
Fix nasty crash from incorrect log call.
r309 return ''
else:
return lineout
fperez
- temporarily disablex my changes from yesterday, they introduced bugs.
r533
vivainio
split_user_input users different pattern for splitting in alias expansion
r569 def split_user_input(self,line, pattern = None):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """Split user input into pre-char, function part and rest."""
vivainio
split_user_input users different pattern for splitting in alias expansion
r569 if pattern is None:
pattern = self.line_split
lsplit = pattern.match(line)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if lsplit is None: # no regexp match returns None
fperez
Proper fix for tab-completion bug reported by Alex Schmolck; patch by Dan Milstein
r540 #print "match failed for line '%s'" % line # dbg
fperez
- temporarily disablex my changes from yesterday, they introduced bugs.
r533 try:
iFun,theRest = line.split(None,1)
except ValueError:
fperez
Proper fix for tab-completion bug reported by Alex Schmolck; patch by Dan Milstein
r540 #print "split failed for line '%s'" % line # dbg
fperez
- temporarily disablex my changes from yesterday, they introduced bugs.
r533 iFun,theRest = line,''
pre = re.match('^(\s*)(.*)',line).groups()[0]
else:
pre,iFun,theRest = lsplit.groups()
fperez
- More unicode fixes, properly split user input without generating...
r581 # iFun has to be a valid python identifier, so it better be only pure
#ascii, no unicode:
try:
iFun = iFun.encode('ascii')
except UnicodeEncodeError:
theRest = iFun+u' '+theRest
iFun = u''
fperez
- temporarily disablex my changes from yesterday, they introduced bugs.
r533 #print 'line:<%s>' % line # dbg
#print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
return pre,iFun.strip(),theRest
fperez
Proper fix for tab-completion bug reported by Alex Schmolck; patch by Dan Milstein
r540 # THIS VERSION IS BROKEN!!! It was intended to prevent spurious attribute
# accesses with a more stringent check of inputs, but it introduced other
# bugs. Disable it for now until I can properly fix it.
def split_user_inputBROKEN(self,line):
fperez
- temporarily disablex my changes from yesterday, they introduced bugs.
r533 """Split user input into pre-char, function part and rest."""
lsplit = self.line_split.match(line)
if lsplit is None: # no regexp match returns None
fperez
Fixes to input splitting to reduce the occurrences of spurious attribute...
r529 lsplit = self.line_split_fallback.match(line)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
Fixes to input splitting to reduce the occurrences of spurious attribute...
r529 #pre,iFun,theRest = lsplit.groups() # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #print 'line:<%s>' % line # dbg
#print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
fperez
Fixes to input splitting to reduce the occurrences of spurious attribute...
r529 #return pre,iFun.strip(),theRest # dbg
return lsplit.groups()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def _prefilter(self, line, continue_prompt):
"""Calls different preprocessors, depending on the form of line."""
# All handlers *must* return a value, even if it's blank ('').
# Lines are NOT logged here. Handlers should process the line as
# needed, update the cache AND log it (so that the input cache array
# stays synced).
# This function is _very_ delicate, and since it's also the one which
# determines IPython's response to user input, it must be as efficient
# as possible. For this reason it has _many_ returns in it, trying
# always to exit as quickly as it can figure out what it needs to do.
# This function is the main responsible for maintaining IPython's
# behavior respectful of Python's semantics. So be _very_ careful if
# making changes to anything here.
#.....................................................................
# Code begins
#if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg
# save the line away in case we crash, so the post-mortem handler can
# record it
self._last_input_line = line
#print '***line: <%s>' % line # dbg
fperez
Indentation improvements: ...
r50
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # the input history needs to track even empty lines
vivainio
mods
r149 stripped = line.strip()
if not stripped:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if not continue_prompt:
self.outputcache.prompt_count -= 1
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 return self.handle_normal(line,continue_prompt)
#return self.handle_normal('',continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# print '***cont',continue_prompt # dbg
# special handlers are only allowed for single line statements
if continue_prompt and not self.rc.multi_line_specials:
return self.handle_normal(line,continue_prompt)
vivainio
mods
r149
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # For the rest, we need the structure of the input
pre,iFun,theRest = self.split_user_input(line)
vivainio
mods
r149
# See whether any pre-existing handler can take care of it
rewritten = self.hooks.input_prefilter(stripped)
if rewritten != stripped: # ok, some prefilter did something
rewritten = pre + rewritten # add indentation
return self.handle_normal(rewritten)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
vivainio
fix !command /?. Closes \#52
r570
# Next, check if we can automatically execute this thing
# Allow ! in multi-line statements if multi_line_specials is on:
if continue_prompt and self.rc.multi_line_specials and \
iFun.startswith(self.ESC_SHELL):
return self.handle_shell_escape(line,continue_prompt,
pre=pre,iFun=iFun,
theRest=theRest)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
# First check for explicit escapes in the last/first character
handler = None
fperez
- Close #52, patch by Stefan.
r586 if line[-1] == self.ESC_HELP and line[0] != self.ESC_SHELL:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 handler = self.esc_handlers.get(line[-1]) # the ? can be at the end
if handler is None:
# look at the first character of iFun, NOT of line, so we skip
# leading whitespace in multiline input
handler = self.esc_handlers.get(iFun[0:1])
if handler is not None:
return handler(line,continue_prompt,pre,iFun,theRest)
# Emacs ipython-mode tags certain input lines
if line.endswith('# PYTHON-MODE'):
return self.handle_emacs(line,continue_prompt)
# Let's try to find if the input line is a magic fn
oinfo = None
if hasattr(self,'magic_'+iFun):
fperez
- thread-safety fixes...
r69 # WARNING: _ofind uses getattr(), so it can consume generators and
# cause other side effects.
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
if oinfo['ismagic']:
# Be careful not to call magics when a variable assignment is
# being made (ls='hi', for example)
if self.rc.automagic and \
(len(theRest)==0 or theRest[0] not in '!=()<>,') and \
(self.rc.multi_line_specials or not continue_prompt):
return self.handle_magic(line,continue_prompt,
pre,iFun,theRest)
else:
return self.handle_normal(line,continue_prompt)
# If the rest of the line begins with an (in)equality, assginment or
# function call, we should not call _ofind but simply execute it.
# This avoids spurious geattr() accesses on objects upon assignment.
#
# It also allows users to assign to either alias or magic names true
# python variables (the magic/alias systems always take second seat to
# true python code).
fperez
- Various small fixes and cleanups....
r593 if theRest and theRest[0] in '!=()':
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return self.handle_normal(line,continue_prompt)
fperez
- Various small fixes and cleanups....
r593
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if oinfo is None:
fperez
Ensure that, with autocall off, attribute access will never be performed...
r70 # let's try to ensure that _oinfo is ONLY called when autocall is
# on. Since it has inevitable potential side effects, at least
# having autocall off should be a guarantee to the user that no
# weird things will happen.
if self.rc.autocall:
oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
else:
# in this case, all that's left is either an alias or
# processing the line normally.
if iFun in self.alias_table:
fperez
- fix bug where aliases would shadow variables when autocall was fully off....
r299 # if autocall is off, by not running _ofind we won't know
# whether the given name may also exist in one of the
# user's namespace. At this point, it's best to do a
# quick check just to be sure that we don't let aliases
# shadow variables.
head = iFun.split('.',1)[0]
if head in self.user_ns or head in self.internal_ns \
or head in __builtin__.__dict__:
return self.handle_normal(line,continue_prompt)
else:
return self.handle_alias(line,continue_prompt,
pre,iFun,theRest)
vivainio
Fixed logical flaw (harmless so far) in handle_shell_escape
r108
fperez
Ensure that, with autocall off, attribute access will never be performed...
r70 else:
return self.handle_normal(line,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
if not oinfo['found']:
return self.handle_normal(line,continue_prompt)
else:
vivainio
fixed , and ; autocall to not consider exclusion regexp
r120 #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if oinfo['isalias']:
return self.handle_alias(line,continue_prompt,
pre,iFun,theRest)
vivainio
fixed , and ; autocall to not consider exclusion regexp
r120 if (self.rc.autocall
and
(
#only consider exclusion re if not "," or ";" autoquoting
vivainio
/f 1 2 -> f(1,2), not f(1 2). I.e. autoparen fixes
r155 (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2
or pre == self.ESC_PAREN) or
vivainio
fixed , and ; autocall to not consider exclusion regexp
r120 (not self.re_exclude_auto.match(theRest)))
and
self.re_fun_name.match(iFun) and
callable(oinfo['obj'])) :
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #print 'going auto' # dbg
fperez
- Add autocall 'smart' mode....
r84 return self.handle_auto(line,continue_prompt,
pre,iFun,theRest,oinfo['obj'])
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
#print 'was callable?', callable(oinfo['obj']) # dbg
return self.handle_normal(line,continue_prompt)
# If we get here, we have a normal Python line. Log and return.
return self.handle_normal(line,continue_prompt)
def _prefilter_dumb(self, line, continue_prompt):
"""simple prefilter function, for debugging"""
return self.handle_normal(line,continue_prompt)
fperez
Apply Ville's patch, closes #87
r367
def multiline_prefilter(self, line, continue_prompt):
""" Run _prefilter for each line of input
Covers cases where there are multiple lines in the user entry,
which is the case when the user goes back to a multiline history
entry and presses enter.
"""
out = []
for l in line.rstrip('\n').split('\n'):
out.append(self._prefilter(l, continue_prompt))
return '\n'.join(out)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Set the default prefilter() function (this can be user-overridden)
fperez
Apply Ville's patch, closes #87
r367 prefilter = multiline_prefilter
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def handle_normal(self,line,continue_prompt=None,
pre=None,iFun=None,theRest=None):
"""Handle normal input lines. Use as a template for handlers."""
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 # With autoindent on, we need some way to exit the input loop, and I
# don't want to force the user to have to backspace all the way to
# clear the line. The rule will be in this case, that either two
# lines of pure whitespace in a row, or a line of pure whitespace but
# of a size different to the indent level, will exit the input loop.
fperez
- Fix autoindent which I had broken......
r72
fperez
%autocall fixes...
r106 if (continue_prompt and self.autoindent and line.isspace() and
vivainio
Merge from branches/0.7.1 into trunk, revs 1052-1057
r136 (0 < abs(len(line) - self.indent_current_nsp) <= 2 or
fperez
_tentative_ fixes to pasting of multiline code with autoindent on. Needs...
r125 (self.buffer[-1]).isspace() )):
fperez
Add support for multiline input with blank lines in it. Closes issue 43.
r53 line = ''
fperez
Fix nasty crash from incorrect log call.
r309 self.log(line,line,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return line
def handle_alias(self,line,continue_prompt=None,
pre=None,iFun=None,theRest=None):
"""Handle alias input lines. """
fperez
fix handling of aliases/system calls for multiline input
r76 # pre is needed, because it carries the leading whitespace. Otherwise
# aliases won't work in indented sections.
vivainio
Aliases are no transitive, i.e. expand recursively
r374 transformed = self.expand_aliases(iFun, theRest)
vivainio
ipalias deprecated/redundant; aliases are converted and called...
r169 line_out = '%s_ip.system(%s)' % (pre, make_quoted_expr( transformed ))
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,line_out,continue_prompt)
fperez
fix crash with missing profiles
r316 #print 'line out:',line_out # dbg
fperez
- Fix autoindent which I had broken......
r72 return line_out
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
def handle_shell_escape(self, line, continue_prompt=None,
pre=None,iFun=None,theRest=None):
"""Execute the line in a shell, empty return value"""
fperez
* IPython/iplib.py (runsource): remove self.code_to_run_src attribute. I...
r10 #print 'line in :', `line` # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # Example of a special handler. Others follow a similar pattern.
vivainio
Made ! and !! shell escapes work again in multiline statements.
r105 if line.lstrip().startswith('!!'):
vivainio
Prettified and hardened string/backslash quoting with ipsystem(), ipalias() and ...
r100 # rewrite iFun/theRest to properly hold the call to %sx and
# the actual command to be executed, so handle_magic can work
# correctly
theRest = '%s %s' % (iFun[2:],theRest)
iFun = 'sx'
vivainio
Fixed logical flaw (harmless so far) in handle_shell_escape
r108 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,
line.lstrip()[2:]),
vivainio
Prettified and hardened string/backslash quoting with ipsystem(), ipalias() and ...
r100 continue_prompt,pre,iFun,theRest)
else:
vivainio
Fixed logical flaw (harmless so far) in handle_shell_escape
r108 cmd=line.lstrip().lstrip('!')
vivainio
ipsystem() -> _ip.system()
r159 line_out = '%s_ip.system(%s)' % (pre,make_quoted_expr(cmd))
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # update cache/log and return
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,line_out,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return line_out
def handle_magic(self, line, continue_prompt=None,
pre=None,iFun=None,theRest=None):
vivainio
Prettified and hardened string/backslash quoting with ipsystem(), ipalias() and ...
r100 """Execute magic functions."""
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
vivainio
-Expose IPApi is _ip in user namespace....
r158 cmd = '%s_ip.magic(%s)' % (pre,make_quoted_expr(iFun + " " + theRest))
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,cmd,continue_prompt)
fperez
clean up debug messages left in by accident
r48 #print 'in handle_magic, cmd=<%s>' % cmd # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return cmd
def handle_auto(self, line, continue_prompt=None,
fperez
- Add autocall 'smart' mode....
r84 pre=None,iFun=None,theRest=None,obj=None):
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 """Hande lines which can be auto-executed, quoting if requested."""
#print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
# This should only be active for single-line input!
if continue_prompt:
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,line,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return line
fperez
- Add autocall 'smart' mode....
r84 auto_rewrite = True
vivainio
/f 1 2 -> f(1,2), not f(1 2). I.e. autoparen fixes
r155
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if pre == self.ESC_QUOTE:
# Auto-quote splitting on whitespace
fperez
Fix extra newlines in autocalling.
r19 newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) )
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 elif pre == self.ESC_QUOTE2:
# Auto-quote whole string
fperez
Fix extra newlines in autocalling.
r19 newcmd = '%s("%s")' % (iFun,theRest)
vivainio
/f 1 2 -> f(1,2), not f(1 2). I.e. autoparen fixes
r155 elif pre == self.ESC_PAREN:
newcmd = '%s(%s)' % (iFun,",".join(theRest.split()))
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
fperez
- Add autocall 'smart' mode....
r84 # Auto-paren.
# We only apply it to argument-less calls if the autocall
# parameter is set to 2. We only need to check that autocall is <
# 2, since this function isn't called unless it's at least 1.
fperez
Fix gtk threading bug
r87 if not theRest and (self.rc.autocall < 2):
newcmd = '%s %s' % (iFun,theRest)
auto_rewrite = False
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 else:
fperez
- Add autocall 'smart' mode....
r84 if theRest.startswith('['):
if hasattr(obj,'__getitem__'):
# Don't autocall in this case: item access for an object
# which is BOTH callable and implements __getitem__.
newcmd = '%s %s' % (iFun,theRest)
auto_rewrite = False
else:
# if the object doesn't support [] access, go ahead and
# autocall
vivainio
retry commit, autocall fixes
r179 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
fperez
- Add autocall 'smart' mode....
r84 elif theRest.endswith(';'):
newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1])
else:
vivainio
retry commit, autocall fixes
r179 newcmd = '%s(%s)' % (iFun.rstrip(), theRest)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0
fperez
- Add autocall 'smart' mode....
r84 if auto_rewrite:
print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # log what is now valid Python, not the actual user input (without the
# final newline)
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,newcmd,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return newcmd
def handle_help(self, line, continue_prompt=None,
pre=None,iFun=None,theRest=None):
"""Try to get some help for the object.
obj? or ?obj -> basic information.
obj?? or ??obj -> more details.
"""
# We need to make sure that we don't process lines which would be
# otherwise valid python, such as "x=1 # what?"
try:
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 codeop.compile_command(line)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except SyntaxError:
# We should only handle as help stuff which is NOT valid syntax
if line[0]==self.ESC_HELP:
line = line[1:]
elif line[-1]==self.ESC_HELP:
line = line[:-1]
fperez
Add -r option to %logstart, to log 'raw' input instead of the processed one....
r305 self.log(line,'#?'+line,continue_prompt)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 if line:
fperez
Fix for unicode support, python identifiers can only be ascii so we need to...
r576 #print 'line:<%r>' % line # dbg
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 self.magic_pinfo(line)
else:
page(self.usage,screen_lines=self.rc.screen_length)
return '' # Empty string is needed here!
except:
# Pass any other exceptions through to the normal handler
return self.handle_normal(line,continue_prompt)
else:
# If the code compiles ok, we should handle it normally
return self.handle_normal(line,continue_prompt)
vivainio
-iplib.py: added InteractiveShell.getapi(). New magics should be...
r152 def getapi(self):
""" Get an IPApi object for this shell instance
Getting an IPApi object is always preferable to accessing the shell
directly, but this holds true especially for extensions.
It should always be possible to implement an extension with IPApi
alone. If not, contact maintainer to request an addition.
"""
return self.api
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def handle_emacs(self,line,continue_prompt=None,
pre=None,iFun=None,theRest=None):
"""Handle input lines marked by python-mode."""
# Currently, nothing is done. Later more functionality can be added
# here if needed.
# The input cache shouldn't be updated
return line
fperez
Fixes to:...
r82 def mktempfile(self,data=None):
"""Make a new tempfile and return its filename.
This makes a call to tempfile.mktemp, but it registers the created
filename internally so ipython cleans it up at exit time.
Optional inputs:
- data(None): if data is given, it gets written out to the temp file
immediately, and the file is closed again."""
fperez
Ready for 0.7.0 release!...
r93 filename = tempfile.mktemp('.py','ipython_edit_')
fperez
Fixes to:...
r82 self.tempfiles.append(filename)
if data:
tmp_file = open(filename,'w')
tmp_file.write(data)
tmp_file.close()
return filename
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def write(self,data):
"""Write a string to the default output"""
Term.cout.write(data)
def write_err(self,data):
"""Write a string to the default error output"""
Term.cerr.write(data)
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 def exit(self):
"""Handle interactive exit.
This method sets the exit_now attribute."""
if self.rc.confirm_exit:
vivainio
added 'quiet' option
r323 if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'):
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 self.exit_now = True
else:
self.exit_now = True
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 def safe_execfile(self,fname,*where,**kw):
fperez
- Automatically prepend 'if 1:' to user input that starts with whitespace,...
r420 """A safe version of the builtin execfile().
This version will never throw an exception, and knows how to handle
ipython logs as well."""
def syspath_cleanup():
"""Internal cleanup routine for sys.path."""
if add_dname:
try:
sys.path.remove(dname)
except ValueError:
# For some reason the user has already removed it, ignore.
pass
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 fname = os.path.expanduser(fname)
fperez
- Automatically prepend 'if 1:' to user input that starts with whitespace,...
r420 # Find things also in current directory. This is needed to mimic the
# behavior of running a script from the system command line, where
# Python inserts the script's directory into sys.path
dname = os.path.dirname(os.path.abspath(fname))
add_dname = False
if dname not in sys.path:
sys.path.insert(0,dname)
add_dname = True
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 try:
xfile = open(fname)
except:
print >> Term.cerr, \
'Could not open file <%s> for safe execution.' % fname
fperez
- Automatically prepend 'if 1:' to user input that starts with whitespace,...
r420 syspath_cleanup()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 return None
kw.setdefault('islog',0)
kw.setdefault('quiet',1)
kw.setdefault('exit_ignore',0)
first = xfile.readline()
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 loghead = str(self.loghead_tpl).split('\n',1)[0].strip()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 xfile.close()
# line by line execution
fperez
Major cleanups and changes, see changelog/changeset for full details.
r60 if first.startswith(loghead) or kw['islog']:
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 print 'Loading log file <%s> one line at a time...' % fname
if kw['quiet']:
stdout_save = sys.stdout
sys.stdout = StringIO.StringIO()
try:
globs,locs = where[0:2]
except:
try:
globs = locs = where[0]
except:
globs = locs = globals()
badblocks = []
# we also need to identify indented blocks of code when replaying
# logs and put them together before passing them to an exec
# statement. This takes a bit of regexp and look-ahead work in the
# file. It's easiest if we swallow the whole thing in memory
# first, and manually walk through the lines list moving the
# counter ourselves.
indent_re = re.compile('\s+\S')
xfile = open(fname)
filelines = xfile.readlines()
xfile.close()
nlines = len(filelines)
lnum = 0
while lnum < nlines:
line = filelines[lnum]
lnum += 1
# don't re-insert logger status info into cache
if line.startswith('#log#'):
continue
else:
# build a block of code (maybe a single line) for execution
block = line
try:
next = filelines[lnum] # lnum has already incremented
except:
next = None
while next and indent_re.match(next):
block += next
lnum += 1
try:
next = filelines[lnum]
except:
next = None
# now execute the block of one or more lines
try:
exec block in globs,locs
except SystemExit:
pass
except:
badblocks.append(block.rstrip())
if kw['quiet']: # restore stdout
sys.stdout.close()
sys.stdout = stdout_save
print 'Finished replaying log file <%s>' % fname
if badblocks:
fperez
- Big iplib cleanups, moved all tab-completion functionality to its own module...
r51 print >> sys.stderr, ('\nThe following lines/blocks in file '
'<%s> reported errors:' % fname)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 for badline in badblocks:
print >> sys.stderr, badline
else: # regular file execution
try:
vivainio
make "ipython foo.py" work with 2.5.1c1 and later on win32 (do a version check)
r603 if sys.platform == 'win32' and sys.version_info < (2,5,1):
fperez
- Add a safeguard under Win32 to protect against a bug in Python's...
r582 # Work around a bug in Python for Windows. The bug was
# fixed in in Python 2.5 r54159 and 54158, but that's still
# SVN Python as of March/07. For details, see:
# http://projects.scipy.org/ipython/ipython/ticket/123
jstenar
Fix bug in iplib.py/safe_execfile that raises an IndexError when ipython is launched with a script as in ./ipython.py foo.py
r619 try:
globs,locs = where[0:2]
except:
try:
globs = locs = where[0]
except:
globs = locs = globals()
exec file(fname) in globs,locs
fperez
- Add a safeguard under Win32 to protect against a bug in Python's...
r582 else:
execfile(fname,*where)
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 except SyntaxError:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 self.showsyntaxerror()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 warn('Failure executing file: <%s>' % fname)
except SystemExit,status:
if not kw['exit_ignore']:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 self.showtraceback()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 warn('Failure executing file: <%s>' % fname)
except:
fperez
Restore sys.last_traceback and friends, for the benefit of pdb.pm(). Let's hope it doesn't cause problems with threaded shells (tested, OK so far). Other exception-related cleanups.
r216 self.showtraceback()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 warn('Failure executing file: <%s>' % fname)
fperez
- Automatically prepend 'if 1:' to user input that starts with whitespace,...
r420 syspath_cleanup()
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 #************************* end of file <iplib.py> *****************************