From 06faf1332da17c6f5154bc63f9359eaf32ab4849 2006-01-12 08:39:26 From: fperez Date: 2006-01-12 08:39:26 Subject: [PATCH] Rename Struct to ipstruct, to fix a bug under windows due to shadowing of the builtin struct module. Other minor fixes --- diff --git a/IPython/ColorANSI.py b/IPython/ColorANSI.py index 6d82dbf..edc23bf 100644 --- a/IPython/ColorANSI.py +++ b/IPython/ColorANSI.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tools for coloring text in ANSI terminals. -$Id: ColorANSI.py 994 2006-01-08 08:29:44Z fperez $""" +$Id: ColorANSI.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2002-2006 Fernando Perez. @@ -18,7 +18,7 @@ __all__ = ['TermColors','InputTermColors','ColorScheme','ColorSchemeTable'] import os -from IPython.Struct import Struct +from IPython.ipstruct import Struct def make_color_table(in_class): """Build a set of color attributes in a class. diff --git a/IPython/ConfigLoader.py b/IPython/ConfigLoader.py index 95aa0d7..c7a67f8 100644 --- a/IPython/ConfigLoader.py +++ b/IPython/ConfigLoader.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Configuration loader -$Id: ConfigLoader.py 994 2006-01-08 08:29:44Z fperez $""" +$Id: ConfigLoader.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez. @@ -19,7 +19,7 @@ import os from pprint import pprint from IPython import ultraTB -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.genutils import * class ConfigLoaderError(exceptions.Exception): diff --git a/IPython/Magic.py b/IPython/Magic.py index 93fea88..c240c4e 100644 --- a/IPython/Magic.py +++ b/IPython/Magic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Magic functions for InteractiveShell. -$Id: Magic.py 1003 2006-01-11 22:18:56Z vivainio $""" +$Id: Magic.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001 Janko Hauser and @@ -46,7 +46,7 @@ from IPython import Debugger, OInspect, wildcard from IPython.FakeModule import FakeModule from IPython.Itpl import Itpl, itpl, printpl,itplns from IPython.PyColorize import Parser -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.macro import Macro from IPython.genutils import * diff --git a/IPython/Prompts.py b/IPython/Prompts.py index 0dc313a..d8aee7e 100644 --- a/IPython/Prompts.py +++ b/IPython/Prompts.py @@ -2,7 +2,7 @@ """ Classes for handling input/output prompts. -$Id: Prompts.py 994 2006-01-08 08:29:44Z fperez $""" +$Id: Prompts.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez @@ -28,7 +28,7 @@ from pprint import pprint,pformat # IPython's own from IPython import ColorANSI from IPython.Itpl import ItplNS -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.macro import Macro from IPython.genutils import * diff --git a/IPython/Shell.py b/IPython/Shell.py index 96f983a..e447627 100644 --- a/IPython/Shell.py +++ b/IPython/Shell.py @@ -4,7 +4,7 @@ All the matplotlib support code was co-developed with John Hunter, matplotlib's author. -$Id: Shell.py 1002 2006-01-11 22:18:29Z fperez $""" +$Id: Shell.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez @@ -32,7 +32,7 @@ from IPython.genutils import Term,warn,error,flag_calls from IPython.iplib import InteractiveShell from IPython.ipmaker import make_IPython from IPython.Magic import Magic -from IPython.Struct import Struct +from IPython.ipstruct import Struct # global flag to pass around information about Ctrl-C without exceptions KBINT = False diff --git a/IPython/__init__.py b/IPython/__init__.py index 2dfc1a5..15d7363 100644 --- a/IPython/__init__.py +++ b/IPython/__init__.py @@ -27,7 +27,7 @@ IPython tries to: IPython requires Python 2.2 or newer. -$Id: __init__.py 998 2006-01-09 06:57:40Z fperez $""" +$Id: __init__.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2004 Fernando Perez. @@ -42,8 +42,8 @@ if sys.version[0:3] < '2.3': raise ImportError, 'Python Version 2.3 or above is required.' # Define what gets imported with a 'from IPython import *' -__all__ = ['deep_reload','genutils','ultraTB','DPyGetOpt','Itpl','hooks', - 'ConfigLoader','OutputTrap','Release','Struct','Shell'] +__all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt', + 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell'] # Load __all__ in IPython namespace so that a simple 'import IPython' gives # access to them via IPython. diff --git a/IPython/iplib.py b/IPython/iplib.py index cd0e75b..eae2697 100644 --- a/IPython/iplib.py +++ b/IPython/iplib.py @@ -6,7 +6,7 @@ Requires Python 2.1 or newer. This file contains all the classes and helper functions specific to IPython. -$Id: iplib.py 1002 2006-01-11 22:18:29Z fperez $ +$Id: iplib.py 1005 2006-01-12 08:39:26Z fperez $ """ #***************************************************************************** @@ -70,7 +70,7 @@ from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns from IPython.Logger import Logger from IPython.Magic import Magic from IPython.Prompts import CachedOutput -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.background_jobs import BackgroundJobManager from IPython.usage import cmd_line_usage,interactive_usage from IPython.genutils import * diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py index fd316f6..42a7c81 100644 --- a/IPython/ipmaker.py +++ b/IPython/ipmaker.py @@ -6,7 +6,7 @@ Requires Python 2.1 or better. This file contains the main make_IPython() starter function. -$Id: ipmaker.py 998 2006-01-09 06:57:40Z fperez $""" +$Id: ipmaker.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez. @@ -46,7 +46,7 @@ from pprint import pprint,pformat # Our own from IPython import DPyGetOpt -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.OutputTrap import OutputTrap from IPython.ConfigLoader import ConfigLoader from IPython.iplib import InteractiveShell diff --git a/IPython/Struct.py b/IPython/ipstruct.py similarity index 99% rename from IPython/Struct.py rename to IPython/ipstruct.py index d3971d7..eb3356f 100644 --- a/IPython/Struct.py +++ b/IPython/ipstruct.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Mimic C structs with lots of extra functionality. -$Id: Struct.py 958 2005-12-27 23:17:51Z fperez $""" +$Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001-2004 Fernando Perez diff --git a/IPython/ultraTB.py b/IPython/ultraTB.py index 9b0ad15..d05b6cc 100644 --- a/IPython/ultraTB.py +++ b/IPython/ultraTB.py @@ -60,7 +60,7 @@ You can implement other color schemes easily, the syntax is fairly self-explanatory. Please send back new schemes you develop to the author for possible inclusion in future releases. -$Id: ultraTB.py 994 2006-01-08 08:29:44Z fperez $""" +$Id: ultraTB.py 1005 2006-01-12 08:39:26Z fperez $""" #***************************************************************************** # Copyright (C) 2001 Nathaniel Gray @@ -91,7 +91,7 @@ import types # IPython's own modules # Modified pdb which doesn't damage IPython's readline handling from IPython import Debugger -from IPython.Struct import Struct +from IPython.ipstruct import Struct from IPython.excolors import ExceptionColors from IPython.genutils import Term,uniq_stable,error,info diff --git a/doc/ChangeLog b/doc/ChangeLog index 754a62c..772541e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,14 @@ +2006-01-12 Fernando Perez + + * IPython/ipstruct.py (Struct): Rename IPython.Struct to + IPython.ipstruct, to avoid local shadowing of the stdlib 'struct' + module in case-insensitive installation. Was causing crashes + under win32. Closes http://www.scipy.net/roundup/ipython/issue49. + + * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart + , closes + http://www.scipy.net/roundup/ipython/issue51. + 2006-01-11 Fernando Perez * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the