diff --git a/ipython-unbundle-external-module.patch b/ipython-unbundle-external-module.patch index 0a01a68..028a7d0 100644 --- a/ipython-unbundle-external-module.patch +++ b/ipython-unbundle-external-module.patch @@ -2223,7 +2223,7 @@ Index: ipython-0.10/IPython/external/argparse/__init__.py =================================================================== --- /dev/null +++ ipython-0.10/IPython/external/argparse/__init__.py -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +try: + import argparse + # Workaround an argparse bug @@ -2232,6 +2232,7 @@ Index: ipython-0.10/IPython/external/argparse/__init__.py + argparse.__all__ = list(itertools.chain( [i for i in argparse.__all__ + if i != 'RawTextHelpFormatterArgumentDefaultsHelpFormatter'], + ['RawTextHelpFormatter', 'ArgumentDefaultsHelpFormatter'])) ++ from argparse import * +except ImportError: + from _argparse import * Index: ipython-0.10/IPython/external/argparse.py diff --git a/ipython.spec b/ipython.spec index d054bfe..44fe712 100644 --- a/ipython.spec +++ b/ipython.spec @@ -4,7 +4,7 @@ Name: ipython Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries @@ -197,6 +197,9 @@ rm -rf %{buildroot} %changelog +* Mon Jun 21 2010 Toshio Kuratomi - 0.10-4 +- Update patch for import in argparse + * Fri Jun 11 2010 Thomas Spura - 0.10-3 - fix license tag (#603178) - add requires on wxpython to gui subpackage (#515570)