From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 3 Dec 2015 08:48:51 +0000 (+0200)
Subject: pclean *.patch
X-Git-Tag: auto/th/python-2.7.10-7~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=5c2de80c95cd73e4e60bc42165cc3086c48baa9e;p=packages%2Fpython.git

pclean *.patch
---

diff --git a/python-DNStests.patch b/python-DNStests.patch
index d652cb4..a04e064 100644
--- a/python-DNStests.patch
+++ b/python-DNStests.patch
@@ -11,7 +11,6 @@ Subject: [PATCH] Mark tests that require access to resolver
  4 files changed, 14 insertions(+)
  create mode 100644 Lib/test/checkDNS.py
 
-diff --git a/Lib/test/checkDNS.py b/Lib/test/checkDNS.py
 new file mode 100644
 index 0000000..f77cbe7
 --- /dev/null
@@ -20,7 +19,6 @@ index 0000000..f77cbe7
 +import os
 +
 +canresolve = os.access("/etc/resolv.conf", os.R_OK)
-diff --git a/Lib/test/test_mimetools.py b/Lib/test/test_mimetools.py
 index 86a26dc..8f07ada 100644
 --- a/Lib/test/test_mimetools.py
 +++ b/Lib/test/test_mimetools.py
@@ -39,7 +37,6 @@ index 86a26dc..8f07ada 100644
      def test_boundary(self):
          s = set([""])
          for i in xrange(100):
-diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
 index 81806c9..d88fd97 100644
 --- a/Lib/test/test_smtplib.py
 +++ b/Lib/test/test_smtplib.py
@@ -97,7 +94,6 @@ index 81806c9..d88fd97 100644
      def testNotConnected(self):
          # Test various operations on an unconnected SMTP object that
          # should raise exceptions (at present the attempt in SMTP.send
-diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
 index 3a273f8..e6a4c73 100644
 --- a/Lib/test/test_urllib.py
 +++ b/Lib/test/test_urllib.py
diff --git a/python-ac_fixes.patch b/python-ac_fixes.patch
index 02c72bc..15f05ea 100644
--- a/python-ac_fixes.patch
+++ b/python-ac_fixes.patch
@@ -1,4 +1,3 @@
-diff -Nur Python-2.5.2.orig/configure.ac Python-2.5.2/configure.ac
 --- Python-2.5.2.orig/configure.ac	2008-02-13 19:17:17.000000000 +0000
 +++ Python-2.5.2/configure.ac	2008-02-26 09:43:17.000000000 +0000
 @@ -767,13 +767,13 @@
diff --git a/python-bdist_rpm.patch b/python-bdist_rpm.patch
index 1b7b521..775f499 100644
--- a/python-bdist_rpm.patch
+++ b/python-bdist_rpm.patch
@@ -1,4 +1,3 @@
-diff -dur Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py Python-2.7.10/Lib/distutils/command/bdist_rpm.py
 --- Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py	2015-05-23 18:09:01.000000000 +0200
 +++ Python-2.7.10/Lib/distutils/command/bdist_rpm.py	2015-12-03 09:23:08.000000000 +0100
 @@ -338,6 +338,16 @@
@@ -27,7 +26,6 @@ diff -dur Python-2.7.10.orig/Lib/distutils/command/bdist_rpm.py Python-2.7.10/Li
          q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
              src_rpm, non_src_rpm, spec_path)
  
-diff -dur Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py
 --- Python-2.7.10.orig/Lib/distutils/tests/test_bdist_rpm.py	2015-05-23 18:09:02.000000000 +0200
 +++ Python-2.7.10/Lib/distutils/tests/test_bdist_rpm.py	2015-12-03 09:24:55.000000000 +0100
 @@ -48,6 +48,8 @@
diff --git a/python-install_prefix.patch b/python-install_prefix.patch
index 69dfa15..2670c10 100644
--- a/python-install_prefix.patch
+++ b/python-install_prefix.patch
@@ -1,4 +1,3 @@
-diff -dur -x '*~' -x '*.orig' Python-2.7.6.orig/Lib/distutils/command/install.py Python-2.7.6/Lib/distutils/command/install.py
 --- Python-2.7.6.orig/Lib/distutils/command/install.py	2015-11-22 14:29:00.153420762 +0100
 +++ Python-2.7.6/Lib/distutils/command/install.py	2015-11-22 14:28:19.000000000 +0100
 @@ -13,6 +13,8 @@
@@ -33,7 +32,6 @@ diff -dur -x '*~' -x '*.orig' Python-2.7.6.orig/Lib/distutils/command/install.py
  
              else:
                  if self.exec_prefix is None:
-diff -dur -x '*~' -x '*.orig' Python-2.7.6.orig/Lib/distutils/sysconfig.py Python-2.7.6/Lib/distutils/sysconfig.py
 --- Python-2.7.6.orig/Lib/distutils/sysconfig.py	2015-11-22 14:29:00.153420762 +0100
 +++ Python-2.7.6/Lib/distutils/sysconfig.py	2015-11-22 13:49:06.000000000 +0100
 @@ -19,8 +19,10 @@
@@ -70,7 +68,6 @@ diff -dur -x '*~' -x '*.orig' Python-2.7.6.orig/Lib/distutils/sysconfig.py Pytho
  
      if os.name == "posix":
          if plat_specific: 
-diff -dur -x '*~' -x '*.orig' Python-2.7.6.orig/Lib/site.py Python-2.7.6/Lib/site.py
 --- Python-2.7.6.orig/Lib/site.py	2015-11-22 14:29:00.153420762 +0100
 +++ Python-2.7.6/Lib/site.py	2015-11-22 13:40:03.000000000 +0100
 @@ -64,7 +64,7 @@
diff --git a/python-lib64.patch b/python-lib64.patch
index f61de73..e6a71c3 100644
--- a/python-lib64.patch
+++ b/python-lib64.patch
@@ -1,4 +1,3 @@
-diff -Nur Python-2.5b2.orig/configure.ac Python-2.5b2/configure.ac
 --- Python-2.5b2.orig/configure.ac	2006-07-06 11:13:35.000000000 +0100
 +++ Python-2.5b2/configure.ac	2006-07-12 17:42:51.000000000 +0100
 @@ -503,6 +503,44 @@
@@ -87,7 +86,6 @@ diff -Nur Python-2.5b2.orig/configure.ac Python-2.5b2/configure.ac
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py Python-2.5b2/Lib/distutils/sysconfig.py
 --- Python-2.5b2.orig/Lib/distutils/sysconfig.py	2006-06-27 11:08:25.000000000 +0100
 +++ Python-2.5b2/Lib/distutils/sysconfig.py	2006-07-12 17:42:51.000000000 +0100
 @@ -99,8 +99,12 @@
@@ -116,7 +114,6 @@ diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py Python-2.5b2/Lib/distutil
          check_path(cmd.install_purelib, libdir)
          check_path(cmd.install_headers,
                     os.path.join(destination, "include", "python", "foopkg"))
-diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
 --- Python-2.5b2.orig/Lib/site.py	2006-06-12 09:23:02.000000000 +0100
 +++ Python-2.5b2/Lib/site.py	2006-07-12 17:42:51.000000000 +0100
 @@ -265,12 +265,19 @@
@@ -376,7 +373,6 @@ diff -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data'   : '{userbase}',
-diff -Nur Python-2.5.orig/Modules/getpath.c Python-2.5/Modules/getpath.c
 @@ -532,7 +534,7 @@
      }
      else
diff --git a/python-multilib.patch b/python-multilib.patch
index 1bbc0e1..df7244a 100644
--- a/python-multilib.patch
+++ b/python-multilib.patch
@@ -1,4 +1,3 @@
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Include/pythonrun.h Python-2.7.10/Include/pythonrun.h
 --- Python-2.7.10.orig/Include/pythonrun.h	2015-05-23 18:09:00.000000000 +0200
 +++ Python-2.7.10/Include/pythonrun.h	2015-12-02 19:31:20.058862685 +0100
 @@ -108,6 +108,8 @@
@@ -10,7 +9,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Include/pythonrun.h Python-2.7
  PyAPI_FUNC(const char *) Py_GetCopyright(void);
  PyAPI_FUNC(const char *) Py_GetCompiler(void);
  PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/command/install.py Python-2.7.10/Lib/distutils/command/install.py
 --- Python-2.7.10.orig/Lib/distutils/command/install.py	2015-05-23 18:09:01.000000000 +0200
 +++ Python-2.7.10/Lib/distutils/command/install.py	2015-12-02 19:31:20.058862685 +0100
 @@ -22,6 +22,8 @@
@@ -42,7 +40,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/command/install.
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/sysconfig.py Python-2.7.10/Lib/distutils/sysconfig.py
 --- Python-2.7.10.orig/Lib/distutils/sysconfig.py	2015-05-23 18:09:02.000000000 +0200
 +++ Python-2.7.10/Lib/distutils/sysconfig.py	2015-12-02 19:31:20.058862685 +0100
 @@ -119,8 +119,12 @@
@@ -60,7 +57,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/sysconfig.py Pyt
          if standard_lib:
              return libpython
          else:
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/tests/test_install.py Python-2.7.10/Lib/distutils/tests/test_install.py
 --- Python-2.7.10.orig/Lib/distutils/tests/test_install.py	2015-05-23 18:09:02.000000000 +0200
 +++ Python-2.7.10/Lib/distutils/tests/test_install.py	2015-12-02 19:31:20.058862685 +0100
 @@ -56,7 +56,7 @@
@@ -72,7 +68,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/distutils/tests/test_insta
          check_path(cmd.install_lib, libdir)
          check_path(cmd.install_platlib, libdir)
          check_path(cmd.install_purelib, libdir)
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/site.py Python-2.7.10/Lib/site.py
 --- Python-2.7.10.orig/Lib/site.py	2015-05-23 18:09:06.000000000 +0200
 +++ Python-2.7.10/Lib/site.py	2015-12-02 19:31:20.058862685 +0100
 @@ -288,13 +288,17 @@
@@ -96,7 +91,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/site.py Python-2.7.10/Lib/
          if sys.platform == "darwin":
              # for framework builds *only* we add the standard Apple
              # locations.
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/sysconfig.py Python-2.7.10/Lib/sysconfig.py
 --- Python-2.7.10.orig/Lib/sysconfig.py	2015-05-23 18:09:07.000000000 +0200
 +++ Python-2.7.10/Lib/sysconfig.py	2015-12-02 19:33:48.483250053 +0100
 @@ -5,22 +5,24 @@
@@ -156,7 +150,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/sysconfig.py Python-2.7.10
      return os.path.join(inc_dir, 'pyconfig.h')
  
  def get_scheme_names():
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/test/test_site.py Python-2.7.10/Lib/test/test_site.py
 --- Python-2.7.10.orig/Lib/test/test_site.py	2015-05-23 18:09:12.000000000 +0200
 +++ Python-2.7.10/Lib/test/test_site.py	2015-12-02 19:31:20.058862685 +0100
 @@ -226,7 +226,7 @@
@@ -190,7 +183,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Lib/test/test_site.py Python-2
              self.assertEqual(dirs[1], wanted)
  
  class PthFile(object):
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Makefile.pre.in Python-2.7.10/Makefile.pre.in
 --- Python-2.7.10.orig/Makefile.pre.in	2015-12-02 19:31:01.322061528 +0100
 +++ Python-2.7.10/Makefile.pre.in	2015-12-02 19:31:20.058862685 +0100
 @@ -87,6 +87,8 @@
@@ -220,7 +212,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Makefile.pre.in Python-2.7.10/
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
  		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Modules/getpath.c Python-2.7.10/Modules/getpath.c
 --- Python-2.7.10.orig/Modules/getpath.c	2015-05-23 18:09:20.000000000 +0200
 +++ Python-2.7.10/Modules/getpath.c	2015-12-02 19:31:20.062196042 +0100
 @@ -116,9 +116,21 @@
@@ -256,7 +247,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Modules/getpath.c Python-2.7.1
  
  static void
  reduce(char *dir)
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Python/getplatform.c Python-2.7.10/Python/getplatform.c
 --- Python-2.7.10.orig/Python/getplatform.c	2015-05-23 18:09:24.000000000 +0200
 +++ Python-2.7.10/Python/getplatform.c	2015-12-02 19:31:20.062196042 +0100
 @@ -10,3 +10,23 @@
@@ -283,7 +273,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Python/getplatform.c Python-2.
 +{
 +	return LIB;
 +}
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Python/sysmodule.c Python-2.7.10/Python/sysmodule.c
 --- Python-2.7.10.orig/Python/sysmodule.c	2015-05-23 18:09:24.000000000 +0200
 +++ Python-2.7.10/Python/sysmodule.c	2015-12-02 19:31:20.062196042 +0100
 @@ -1437,6 +1437,10 @@
@@ -297,7 +286,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/Python/sysmodule.c Python-2.7.
      SET_SYS_FROM_STRING("executable",
                          PyString_FromString(Py_GetProgramFullPath()));
      SET_SYS_FROM_STRING("prefix",
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/configure.ac Python-2.7.10/configure.ac
 --- Python-2.7.10.orig/configure.ac	2015-12-02 19:31:01.322061528 +0100
 +++ Python-2.7.10/configure.ac	2015-12-02 19:31:20.062196042 +0100
 @@ -739,6 +739,44 @@
@@ -345,7 +333,6 @@ diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/configure.ac Python-2.7.10/con
  
  AC_SUBST(LIBRARY)
  AC_MSG_CHECKING(LIBRARY)
-diff -durN -x '*~' -x '*.orig' Python-2.7.10.orig/setup.py Python-2.7.10/setup.py
 --- Python-2.7.10.orig/setup.py	2015-12-02 19:31:01.312061456 +0100
 +++ Python-2.7.10/setup.py	2015-12-02 19:31:20.062196042 +0100
 @@ -496,6 +496,7 @@
diff --git a/python-pythonpath.patch b/python-pythonpath.patch
index b0d9536..a86255b 100644
--- a/python-pythonpath.patch
+++ b/python-pythonpath.patch
@@ -1,4 +1,3 @@
-diff -urN Python-2.7.org/Demo/tix/INSTALL.txt Python-2.7/Demo/tix/INSTALL.txt
 --- Python-2.7.org/Demo/tix/INSTALL.txt	2001-11-11 15:07:37.000000000 +0100
 +++ Python-2.7/Demo/tix/INSTALL.txt	2010-07-05 20:00:03.472866047 +0200
 @@ -71,7 +71,7 @@
@@ -39,7 +38,6 @@ diff -urN Python-2.7.org/Demo/tix/INSTALL.txt Python-2.7/Demo/tix/INSTALL.txt
     ``'/usr/local'``.  The returned string points into static storage; the caller
     should not modify its value.  This corresponds to the :makevar:`exec_prefix`
     variable in the top-level :file:`Makefile` and the ``--exec-prefix``
-diff -urN Python-2.7.org/Doc/c-api/intro.rst Python-2.7/Doc/c-api/intro.rst
 --- Python-2.7.org/Doc/c-api/intro.rst	2010-06-11 02:23:01.000000000 +0200
 +++ Python-2.7/Doc/c-api/intro.rst	2010-07-05 20:00:03.482863587 +0200
 @@ -541,7 +541,7 @@
@@ -51,7 +49,6 @@ diff -urN Python-2.7.org/Doc/c-api/intro.rst Python-2.7/Doc/c-api/intro.rst
  :file:`/usr/local/lib/python{X.Y}`.  (In fact, this particular path is also
  the "fallback" location, used when no executable file named :file:`python` is
  found along :envvar:`PATH`.)  The user can override this behavior by setting the
-diff -urN Python-2.7.org/Doc/faq/library.rst Python-2.7/Doc/faq/library.rst
 --- Python-2.7.org/Doc/faq/library.rst	2010-03-12 10:57:43.000000000 +0100
 +++ Python-2.7/Doc/faq/library.rst	2010-07-05 20:00:03.486197135 +0200
 @@ -54,7 +54,7 @@
@@ -72,7 +69,6 @@ diff -urN Python-2.7.org/Doc/faq/library.rst Python-2.7/Doc/faq/library.rst
  
     import httplib, sys, time
  
-diff -urN Python-2.7.org/Doc/install/index.rst Python-2.7/Doc/install/index.rst
 --- Python-2.7.org/Doc/install/index.rst	2009-10-28 00:06:10.000000000 +0100
 +++ Python-2.7/Doc/install/index.rst	2010-07-05 20:00:03.506197416 +0200
 @@ -369,12 +369,12 @@
@@ -90,7 +86,6 @@ diff -urN Python-2.7.org/Doc/install/index.rst Python-2.7/Doc/install/index.rst
  
  In either case, the :option:`--prefix` option defines the installation base, and
  the :option:`--exec-prefix` option defines the platform-specific installation
-diff -urN Python-2.7.org/Doc/library/cgi.rst Python-2.7/Doc/library/cgi.rst
 --- Python-2.7.org/Doc/library/cgi.rst	2009-08-17 21:26:49.000000000 +0200
 +++ Python-2.7/Doc/library/cgi.rst	2010-07-05 20:00:03.509530626 +0200
 @@ -387,7 +387,7 @@
@@ -102,7 +97,6 @@ diff -urN Python-2.7.org/Doc/library/cgi.rst Python-2.7/Doc/library/cgi.rst
  
  Make sure the Python interpreter exists and is executable by "others".
  
-diff -urN Python-2.7.org/Doc/library/pickle.rst Python-2.7/Doc/library/pickle.rst
 --- Python-2.7.org/Doc/library/pickle.rst	2009-04-27 17:29:09.000000000 +0200
 +++ Python-2.7/Doc/library/pickle.rst	2010-07-05 20:00:03.512863651 +0200
 @@ -737,7 +737,7 @@
@@ -123,7 +117,6 @@ diff -urN Python-2.7.org/Doc/library/pickle.rst Python-2.7/Doc/library/pickle.rs
     >>> obj.readline()
     '2: '
     >>> obj.readline()
-diff -urN Python-2.7.org/Doc/tutorial/interpreter.rst Python-2.7/Doc/tutorial/interpreter.rst
 --- Python-2.7.org/Doc/tutorial/interpreter.rst	2010-04-10 13:16:59.000000000 +0200
 +++ Python-2.7/Doc/tutorial/interpreter.rst	2010-07-05 20:00:03.516196870 +0200
 @@ -10,7 +10,7 @@
@@ -135,7 +128,6 @@ diff -urN Python-2.7.org/Doc/tutorial/interpreter.rst Python-2.7/Doc/tutorial/in
  those machines where it is available; putting :file:`/usr/local/bin` in your
  Unix shell's search path makes it possible to start it by typing the command ::
  
-diff -urN Python-2.7.org/Lib/cgi.py Python-2.7/Lib/cgi.py
 --- Python-2.7.org/Lib/cgi.py	2010-03-17 21:05:11.000000000 +0100
 +++ Python-2.7/Lib/cgi.py	2010-07-05 20:00:03.522865338 +0200
 @@ -1,6 +1,6 @@
@@ -147,7 +139,6 @@ diff -urN Python-2.7.org/Lib/cgi.py Python-2.7/Lib/cgi.py
  # intentionally NOT "/usr/bin/env python".  On many systems
  # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
  # scripts, and /usr/local/bin is the default directory where Python is
-diff -urN Python-2.7.org/Mac/PythonLauncher/factorySettings.plist Python-2.7/Mac/PythonLauncher/factorySettings.plist
 --- Python-2.7.org/Mac/PythonLauncher/factorySettings.plist	2004-07-16 14:34:23.000000000 +0200
 +++ Python-2.7/Mac/PythonLauncher/factorySettings.plist	2010-07-05 20:00:03.526197587 +0200
 @@ -10,7 +10,7 @@
@@ -181,7 +172,6 @@ diff -urN Python-2.7.org/Mac/PythonLauncher/factorySettings.plist Python-2.7/Mac
                      <string>/usr/bin/pythonw</string>
                      <string>/usr/bin/python</string>
                      <string>/sw/bin/pythonw</string>
-diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
 --- Python-2.7.org/Misc/HISTORY	2010-03-07 16:23:59.000000000 +0100
 +++ Python-2.7/Misc/HISTORY	2010-07-05 20:00:03.576196805 +0200
 @@ -13236,9 +13236,9 @@
@@ -205,7 +195,6 @@ diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
  demo/scripts/fixps.py will update old scripts in place (you can easily
  modify it to do other similar changes).
  
-diff -urN Python-2.7.org/README Python-2.7/README
 --- Python-2.7.org/README	2010-07-03 15:56:13.000000000 +0200
 +++ Python-2.7/README	2010-07-05 20:00:03.586197142 +0200
 @@ -331,7 +331,7 @@
@@ -217,7 +206,6 @@ diff -urN Python-2.7.org/README Python-2.7/README
          over /usr/bin/python, depending on how you have set up $PATH.
  
  FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or
-diff -urN Python-2.7.org/Tools/faqwiz/faqw.py Python-2.7/Tools/faqwiz/faqw.py
 --- Python-2.7.org/Tools/faqwiz/faqw.py	2010-03-11 23:33:25.000000000 +0100
 +++ Python-2.7/Tools/faqwiz/faqw.py	2010-07-05 20:00:03.589530209 +0200
 @@ -10,7 +10,7 @@
@@ -229,7 +217,6 @@ diff -urN Python-2.7.org/Tools/faqwiz/faqw.py Python-2.7/Tools/faqwiz/faqw.py
  # interpreter lives, change the value for FAQDIR to where your FAQ
  # lives, and change the value for SRCDIR to where your faqwiz.py
  # module lives.  The faqconf.py and faqcust.py files live there, too.
-diff -urN Python-2.7.org/Tools/pybench/pybench.py Python-2.7/Tools/pybench/pybench.py
 --- Python-2.7.org/Tools/pybench/pybench.py	2009-10-09 16:32:19.000000000 +0200
 +++ Python-2.7/Tools/pybench/pybench.py	2010-07-05 20:00:03.592863527 +0200
 @@ -1,4 +1,4 @@
@@ -238,7 +225,6 @@ diff -urN Python-2.7.org/Tools/pybench/pybench.py Python-2.7/Tools/pybench/pyben
  
  """ A Python Benchmark Suite
  
-diff -urN Python-2.7.org/Tools/pybench/README Python-2.7/Tools/pybench/README
 --- Python-2.7.org/Tools/pybench/README	2006-06-13 20:56:56.000000000 +0200
 +++ Python-2.7/Tools/pybench/README	2010-07-05 20:00:03.596196761 +0200
 @@ -141,7 +141,7 @@
@@ -250,7 +236,6 @@ diff -urN Python-2.7.org/Tools/pybench/README Python-2.7/Tools/pybench/README
         Version:      2.4.2
         Compiler:     GCC 3.3.4 (pre 3.3.5 20040809)
         Bits:         64bit
-diff -urN Python-2.7.org/Tools/scripts/fixps.py Python-2.7/Tools/scripts/fixps.py
 --- Python-2.7.org/Tools/scripts/fixps.py	2004-08-09 19:27:55.000000000 +0200
 +++ Python-2.7/Tools/scripts/fixps.py	2010-07-05 20:00:03.599292989 +0200
 @@ -15,13 +15,13 @@
@@ -270,7 +255,6 @@ diff -urN Python-2.7.org/Tools/scripts/fixps.py Python-2.7/Tools/scripts/fixps.p
                        '/usr/bin/env python', line)
          print filename, ':', repr(line)
          f = open(filename, "w")
-diff -urN Python-2.7.org/Tools/scripts/README Python-2.7/Tools/scripts/README
 --- Python-2.7.org/Tools/scripts/README	2010-02-24 18:06:31.000000000 +0100
 +++ Python-2.7/Tools/scripts/README	2010-07-05 20:00:03.602863895 +0200
 @@ -47,7 +47,7 @@