##// END OF EJS Templates
Fix pickleshare import
fperez -
Show More
@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 2862 2007-11-09 20:56:18Z bgranger $
9 $Id: iplib.py 2871 2007-11-25 04:28:19Z fperez $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -55,7 +55,6 b' import sys'
55 import tempfile
55 import tempfile
56 import traceback
56 import traceback
57 import types
57 import types
58 import pickleshare
59 from sets import Set
58 from sets import Set
60 from pprint import pprint, pformat
59 from pprint import pprint, pformat
61
60
@@ -63,6 +62,7 b' from pprint import pprint, pformat'
63 #import IPython
62 #import IPython
64 from IPython import Debugger,OInspect,PyColorize,ultraTB
63 from IPython import Debugger,OInspect,PyColorize,ultraTB
65 from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names
64 from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names
65 from IPython.Extensions import pickleshare
66 from IPython.FakeModule import FakeModule
66 from IPython.FakeModule import FakeModule
67 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
67 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
68 from IPython.Logger import Logger
68 from IPython.Logger import Logger
@@ -1841,6 +1841,7 b' want to merge them back into the new files.""" % locals()'
1841 self.indent_current_nsp -= 4
1841 self.indent_current_nsp -= 4
1842 else:
1842 else:
1843 self.indent_current_nsp = 0
1843 self.indent_current_nsp = 0
1844
1844 def runlines(self,lines):
1845 def runlines(self,lines):
1845 """Run a string of one or more lines of source.
1846 """Run a string of one or more lines of source.
1846
1847
General Comments 0
You need to be logged in to leave comments. Login now