##// END OF EJS Templates
corrected some problematic module interdependencies
vivainio -
Show More
@@ -27,7 +27,7 b' IPython tries to:'
27
27
28 IPython requires Python 2.3 or newer.
28 IPython requires Python 2.3 or newer.
29
29
30 $Id: __init__.py 2393 2007-05-25 18:26:31Z vivainio $"""
30 $Id: __init__.py 2398 2007-05-26 10:20:14Z vivainio $"""
31
31
32 #*****************************************************************************
32 #*****************************************************************************
33 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
33 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -48,10 +48,10 b' import os'
48 sys.path.append(os.path.dirname(__file__) + "/Extensions")
48 sys.path.append(os.path.dirname(__file__) + "/Extensions")
49
49
50 # Define what gets imported with a 'from IPython import *'
50 # Define what gets imported with a 'from IPython import *'
51 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
51 __all__ = ['ipapi','generics','deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
52 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
52 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
53 'platutils','platutils_win32','platutils_posix','platutils_dummy',
53 'platutils','platutils_win32','platutils_posix','platutils_dummy',
54 'ipapi','rlineimpl', 'strdispatch']
54 'rlineimpl', 'strdispatch']
55
55
56 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
56 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
57 # access to them via IPython.<name>
57 # access to them via IPython.<name>
@@ -59,6 +59,8 b' glob,loc = globals(),locals()'
59 for name in __all__:
59 for name in __all__:
60 __import__(name,glob,loc,[])
60 __import__(name,glob,loc,[])
61
61
62 import Shell
63
62 # Release data
64 # Release data
63 from IPython import Release # do it explicitly so pydoc can see it - pydoc bug
65 from IPython import Release # do it explicitly so pydoc can see it - pydoc bug
64 __author__ = '%s <%s>\n%s <%s>\n%s <%s>' % \
66 __author__ = '%s <%s>\n%s <%s>\n%s <%s>' % \
@@ -1,7 +1,7 b''
1 from IPython.ipapi import TryNext
1 from IPython.ipapi import TryNext
2 from IPython.external.simplegeneric import generic
2 from IPython.external.simplegeneric import generic
3
3
4 """ 'Generic' functions for extending IPython
4 ''' 'Generic' functions for extending IPython
5
5
6 See http://cheeseshop.python.org/pypi/simplegeneric
6 See http://cheeseshop.python.org/pypi/simplegeneric
7
7
@@ -17,7 +17,7 b" Here's an example from genutils.py:"
17 (Yes, the nasty syntax is for python 2.3 compatibility. Your own extensions
17 (Yes, the nasty syntax is for python 2.3 compatibility. Your own extensions
18 can use the niftier decorator syntax)
18 can use the niftier decorator syntax)
19
19
20 """
20 '''
21
21
22 @generic
22 @generic
23 def result_display(result):
23 def result_display(result):
@@ -5,7 +5,7 b' General purpose utilities.'
5 This is a grab-bag of stuff I find useful in most programs I write. Some of
5 This is a grab-bag of stuff I find useful in most programs I write. Some of
6 these things are also convenient when working at the command line.
6 these things are also convenient when working at the command line.
7
7
8 $Id: genutils.py 2397 2007-05-26 10:06:26Z vivainio $"""
8 $Id: genutils.py 2398 2007-05-26 10:20:14Z vivainio $"""
9
9
10 #*****************************************************************************
10 #*****************************************************************************
11 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
11 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -913,8 +913,6 b' class LSString(str):'
913
913
914 p = paths = property(get_paths)
914 p = paths = property(get_paths)
915
915
916
917
918 def print_lsstring(arg):
916 def print_lsstring(arg):
919 """ Prettier (non-repr-like) and more informative printer for LSString """
917 """ Prettier (non-repr-like) and more informative printer for LSString """
920 print "LSString (.p, .n, .l, .s available). Value:"
918 print "LSString (.p, .n, .l, .s available). Value:"
@@ -65,7 +65,7 b' import __builtin__'
65 import sys
65 import sys
66
66
67 # our own
67 # our own
68 from IPython.genutils import warn,error
68 #from IPython.genutils import warn,error
69
69
70 class TryNext(Exception):
70 class TryNext(Exception):
71 """Try next hook exception.
71 """Try next hook exception.
@@ -125,7 +125,7 b' class IPythonNotRunning:'
125 def _dummy_warn(self,*args,**kw):
125 def _dummy_warn(self,*args,**kw):
126 """Dummy function, which doesn't do anything but warn."""
126 """Dummy function, which doesn't do anything but warn."""
127
127
128 warn("IPython is not running, this is a dummy no-op function")
128 print ("IPython is not running, this is a dummy no-op function")
129
129
130 def _dummy_silent(self,*args,**kw):
130 def _dummy_silent(self,*args,**kw):
131 """Dummy function, which doesn't do anything and emits no warnings."""
131 """Dummy function, which doesn't do anything and emits no warnings."""
@@ -301,7 +301,7 b' class IPApi:'
301 try:
301 try:
302 user_ns[name] = eval(name,cf.f_globals,cf.f_locals)
302 user_ns[name] = eval(name,cf.f_globals,cf.f_locals)
303 except:
303 except:
304 error('could not get var. %s from %s' %
304 print ('could not get var. %s from %s' %
305 (name,cf.f_code.co_name))
305 (name,cf.f_code.co_name))
306
306
307 def expand_alias(self,line):
307 def expand_alias(self,line):
General Comments 0
You need to be logged in to leave comments. Login now