rpms/ipython/devel ipython-unbundle-external-module.patch, 1.1, 1.2 ipython.spec, 1.31, 1.32

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/ipython/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24246

Modified Files:
	ipython-unbundle-external-module.patch ipython.spec 
Log Message:

* Mon Jun 21 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10-4
- Update patch for import in argparse


ipython-unbundle-external-module.patch:
 IPython/external/Itpl.py                                      |  276 -
 IPython/external/argparse.py                                  | 2216 --------
 IPython/external/configobj.py                                 | 2501 ----------
 IPython/external/guid.py                                      |  170 
 IPython/external/mglob.py                                     |  229 
 IPython/external/path.py                                      |  973 ---
 IPython/external/pretty.py                                    |  705 --
 IPython/external/simplegeneric.py                             |  139 
 IPython/external/validate.py                                  | 1414 -----
 ipython-0.10/IPython/external/Itpl/_Itpl.py                   |  276 +
 ipython-0.10/IPython/external/Itpl/__init__.py                |    4 
 ipython-0.10/IPython/external/argparse/__init__.py            |   11 
 ipython-0.10/IPython/external/argparse/_argparse.py           | 2216 ++++++++
 ipython-0.10/IPython/external/configobj/__init__.py           |    4 
 ipython-0.10/IPython/external/configobj/_configobj.py         | 2501 ++++++++++
 ipython-0.10/IPython/external/guid/__init__.py                |    4 
 ipython-0.10/IPython/external/guid/_guid.py                   |  170 
 ipython-0.10/IPython/external/mglob/__init__.py               |    4 
 ipython-0.10/IPython/external/mglob/_mglob.py                 |  229 
 ipython-0.10/IPython/external/path/__init__.py                |    4 
 ipython-0.10/IPython/external/path/_path.py                   |  973 +++
 ipython-0.10/IPython/external/pretty/__init__.py              |    4 
 ipython-0.10/IPython/external/pretty/_pretty.py               |  705 ++
 ipython-0.10/IPython/external/simplegeneric/__init__.py       |    4 
 ipython-0.10/IPython/external/simplegeneric/_simplegeneric.py |  139 
 ipython-0.10/IPython/external/validate/__init__.py            |    8 
 ipython-0.10/IPython/external/validate/_validate.py           | 1414 +++++
 ipython-0.10/setupbase.py                                     |    9 
 28 files changed, 8679 insertions(+), 8623 deletions(-)

Index: ipython-unbundle-external-module.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ipython/devel/ipython-unbundle-external-module.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ipython-unbundle-external-module.patch	19 Jun 2010 19:45:59 -0000	1.1
+++ ipython-unbundle-external-module.patch	21 Jun 2010 18:39:43 -0000	1.2
@@ -2223,7 +2223,7 @@ Index: ipython-0.10/IPython/external/arg
 ===================================================================
 --- /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/arg
 +        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


Index: ipython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ipython.spec	19 Jun 2010 19:45:59 -0000	1.31
+++ ipython.spec	21 Jun 2010 18:39:44 -0000	1.32
@@ -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 <toshio at fedoraproject.org> - 0.10-4
+- Update patch for import in argparse
+
 * Fri Jun 11 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.10-3
 - fix license tag (#603178)
 - add requires on wxpython to gui subpackage (#515570)