Show More
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Tools for coloring text in ANSI terminals. |
|
2 | """Tools for coloring text in ANSI terminals. | |
3 |
|
3 | |||
4 |
$Id: ColorANSI.py |
|
4 | $Id: ColorANSI.py 1005 2006-01-12 08:39:26Z fperez $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2002-2006 Fernando Perez. <fperez@colorado.edu> |
|
7 | # Copyright (C) 2002-2006 Fernando Perez. <fperez@colorado.edu> | |
@@ -18,7 +18,7 b" __all__ = ['TermColors','InputTermColors','ColorScheme','ColorSchemeTable']" | |||||
18 |
|
18 | |||
19 | import os |
|
19 | import os | |
20 |
|
20 | |||
21 |
from IPython. |
|
21 | from IPython.ipstruct import Struct | |
22 |
|
22 | |||
23 | def make_color_table(in_class): |
|
23 | def make_color_table(in_class): | |
24 | """Build a set of color attributes in a class. |
|
24 | """Build a set of color attributes in a class. |
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Configuration loader |
|
2 | """Configuration loader | |
3 |
|
3 | |||
4 |
$Id: ConfigLoader.py |
|
4 | $Id: ConfigLoader.py 1005 2006-01-12 08:39:26Z fperez $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
7 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
@@ -19,7 +19,7 b' import os' | |||||
19 | from pprint import pprint |
|
19 | from pprint import pprint | |
20 |
|
20 | |||
21 | from IPython import ultraTB |
|
21 | from IPython import ultraTB | |
22 |
from IPython. |
|
22 | from IPython.ipstruct import Struct | |
23 | from IPython.genutils import * |
|
23 | from IPython.genutils import * | |
24 |
|
24 | |||
25 | class ConfigLoaderError(exceptions.Exception): |
|
25 | class ConfigLoaderError(exceptions.Exception): |
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Magic functions for InteractiveShell. |
|
2 | """Magic functions for InteractiveShell. | |
3 |
|
3 | |||
4 |
$Id: Magic.py 100 |
|
4 | $Id: Magic.py 1005 2006-01-12 08:39:26Z fperez $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
@@ -46,7 +46,7 b' from IPython import Debugger, OInspect, wildcard' | |||||
46 | from IPython.FakeModule import FakeModule |
|
46 | from IPython.FakeModule import FakeModule | |
47 | from IPython.Itpl import Itpl, itpl, printpl,itplns |
|
47 | from IPython.Itpl import Itpl, itpl, printpl,itplns | |
48 | from IPython.PyColorize import Parser |
|
48 | from IPython.PyColorize import Parser | |
49 |
from IPython. |
|
49 | from IPython.ipstruct import Struct | |
50 | from IPython.macro import Macro |
|
50 | from IPython.macro import Macro | |
51 | from IPython.genutils import * |
|
51 | from IPython.genutils import * | |
52 |
|
52 |
@@ -2,7 +2,7 b'' | |||||
2 | """ |
|
2 | """ | |
3 | Classes for handling input/output prompts. |
|
3 | Classes for handling input/output prompts. | |
4 |
|
4 | |||
5 |
$Id: Prompts.py |
|
5 | $Id: Prompts.py 1005 2006-01-12 08:39:26Z fperez $""" | |
6 |
|
6 | |||
7 | #***************************************************************************** |
|
7 | #***************************************************************************** | |
8 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
8 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
@@ -28,7 +28,7 b' from pprint import pprint,pformat' | |||||
28 | # IPython's own |
|
28 | # IPython's own | |
29 | from IPython import ColorANSI |
|
29 | from IPython import ColorANSI | |
30 | from IPython.Itpl import ItplNS |
|
30 | from IPython.Itpl import ItplNS | |
31 |
from IPython. |
|
31 | from IPython.ipstruct import Struct | |
32 | from IPython.macro import Macro |
|
32 | from IPython.macro import Macro | |
33 | from IPython.genutils import * |
|
33 | from IPython.genutils import * | |
34 |
|
34 |
@@ -4,7 +4,7 b'' | |||||
4 | All the matplotlib support code was co-developed with John Hunter, |
|
4 | All the matplotlib support code was co-developed with John Hunter, | |
5 | matplotlib's author. |
|
5 | matplotlib's author. | |
6 |
|
6 | |||
7 |
$Id: Shell.py 100 |
|
7 | $Id: Shell.py 1005 2006-01-12 08:39:26Z fperez $""" | |
8 |
|
8 | |||
9 | #***************************************************************************** |
|
9 | #***************************************************************************** | |
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
@@ -32,7 +32,7 b' from IPython.genutils import Term,warn,error,flag_calls' | |||||
32 | from IPython.iplib import InteractiveShell |
|
32 | from IPython.iplib import InteractiveShell | |
33 | from IPython.ipmaker import make_IPython |
|
33 | from IPython.ipmaker import make_IPython | |
34 | from IPython.Magic import Magic |
|
34 | from IPython.Magic import Magic | |
35 |
from IPython. |
|
35 | from IPython.ipstruct import Struct | |
36 |
|
36 | |||
37 | # global flag to pass around information about Ctrl-C without exceptions |
|
37 | # global flag to pass around information about Ctrl-C without exceptions | |
38 | KBINT = False |
|
38 | KBINT = False |
@@ -27,7 +27,7 b' IPython tries to:' | |||||
27 |
|
27 | |||
28 | IPython requires Python 2.2 or newer. |
|
28 | IPython requires Python 2.2 or newer. | |
29 |
|
29 | |||
30 |
$Id: __init__.py |
|
30 | $Id: __init__.py 1005 2006-01-12 08:39:26Z fperez $""" | |
31 |
|
31 | |||
32 | #***************************************************************************** |
|
32 | #***************************************************************************** | |
33 | # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu> |
|
33 | # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu> | |
@@ -42,8 +42,8 b" if sys.version[0:3] < '2.3':" | |||||
42 | raise ImportError, 'Python Version 2.3 or above is required.' |
|
42 | raise ImportError, 'Python Version 2.3 or above is required.' | |
43 |
|
43 | |||
44 | # Define what gets imported with a 'from IPython import *' |
|
44 | # Define what gets imported with a 'from IPython import *' | |
45 |
__all__ = ['deep_reload','genutils','ultraTB','DPyGetOpt', |
|
45 | __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt', | |
46 |
'ConfigLoader','OutputTrap','Release',' |
|
46 | 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell'] | |
47 |
|
47 | |||
48 | # Load __all__ in IPython namespace so that a simple 'import IPython' gives |
|
48 | # Load __all__ in IPython namespace so that a simple 'import IPython' gives | |
49 | # access to them via IPython.<name> |
|
49 | # access to them via IPython.<name> |
@@ -6,7 +6,7 b' Requires Python 2.1 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 100 |
|
9 | $Id: iplib.py 1005 2006-01-12 08:39:26Z fperez $ | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | #***************************************************************************** |
|
12 | #***************************************************************************** | |
@@ -70,7 +70,7 b' from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns' | |||||
70 | from IPython.Logger import Logger |
|
70 | from IPython.Logger import Logger | |
71 | from IPython.Magic import Magic |
|
71 | from IPython.Magic import Magic | |
72 | from IPython.Prompts import CachedOutput |
|
72 | from IPython.Prompts import CachedOutput | |
73 |
from IPython. |
|
73 | from IPython.ipstruct import Struct | |
74 | from IPython.background_jobs import BackgroundJobManager |
|
74 | from IPython.background_jobs import BackgroundJobManager | |
75 | from IPython.usage import cmd_line_usage,interactive_usage |
|
75 | from IPython.usage import cmd_line_usage,interactive_usage | |
76 | from IPython.genutils import * |
|
76 | from IPython.genutils import * |
@@ -6,7 +6,7 b' Requires Python 2.1 or better.' | |||||
6 |
|
6 | |||
7 | This file contains the main make_IPython() starter function. |
|
7 | This file contains the main make_IPython() starter function. | |
8 |
|
8 | |||
9 |
$Id: ipmaker.py |
|
9 | $Id: ipmaker.py 1005 2006-01-12 08:39:26Z fperez $""" | |
10 |
|
10 | |||
11 | #***************************************************************************** |
|
11 | #***************************************************************************** | |
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
@@ -46,7 +46,7 b' from pprint import pprint,pformat' | |||||
46 |
|
46 | |||
47 | # Our own |
|
47 | # Our own | |
48 | from IPython import DPyGetOpt |
|
48 | from IPython import DPyGetOpt | |
49 |
from IPython. |
|
49 | from IPython.ipstruct import Struct | |
50 | from IPython.OutputTrap import OutputTrap |
|
50 | from IPython.OutputTrap import OutputTrap | |
51 | from IPython.ConfigLoader import ConfigLoader |
|
51 | from IPython.ConfigLoader import ConfigLoader | |
52 | from IPython.iplib import InteractiveShell |
|
52 | from IPython.iplib import InteractiveShell |
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Mimic C structs with lots of extra functionality. |
|
2 | """Mimic C structs with lots of extra functionality. | |
3 |
|
3 | |||
4 |
$Id: |
|
4 | $Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> |
|
7 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> |
@@ -60,7 +60,7 b' You can implement other color schemes easily, the syntax is fairly' | |||||
60 | self-explanatory. Please send back new schemes you develop to the author for |
|
60 | self-explanatory. Please send back new schemes you develop to the author for | |
61 | possible inclusion in future releases. |
|
61 | possible inclusion in future releases. | |
62 |
|
62 | |||
63 |
$Id: ultraTB.py |
|
63 | $Id: ultraTB.py 1005 2006-01-12 08:39:26Z fperez $""" | |
64 |
|
64 | |||
65 | #***************************************************************************** |
|
65 | #***************************************************************************** | |
66 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> |
|
66 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> | |
@@ -91,7 +91,7 b' import types' | |||||
91 | # IPython's own modules |
|
91 | # IPython's own modules | |
92 | # Modified pdb which doesn't damage IPython's readline handling |
|
92 | # Modified pdb which doesn't damage IPython's readline handling | |
93 | from IPython import Debugger |
|
93 | from IPython import Debugger | |
94 |
from IPython. |
|
94 | from IPython.ipstruct import Struct | |
95 | from IPython.excolors import ExceptionColors |
|
95 | from IPython.excolors import ExceptionColors | |
96 | from IPython.genutils import Term,uniq_stable,error,info |
|
96 | from IPython.genutils import Term,uniq_stable,error,info | |
97 |
|
97 |
@@ -1,3 +1,14 b'' | |||||
|
1 | 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu> | |||
|
2 | ||||
|
3 | * IPython/ipstruct.py (Struct): Rename IPython.Struct to | |||
|
4 | IPython.ipstruct, to avoid local shadowing of the stdlib 'struct' | |||
|
5 | module in case-insensitive installation. Was causing crashes | |||
|
6 | under win32. Closes http://www.scipy.net/roundup/ipython/issue49. | |||
|
7 | ||||
|
8 | * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart | |||
|
9 | <marienz-AT-gentoo.org>, closes | |||
|
10 | http://www.scipy.net/roundup/ipython/issue51. | |||
|
11 | ||||
1 | 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu> |
|
12 | 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
13 | |||
3 | * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the |
|
14 | * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the |
General Comments 0
You need to be logged in to leave comments.
Login now