Update to 2.7.10

00001-pydocnogui.patch

@@ -2,8 +2,8 @@ diff -up Python-2.7.3/Lib/pydoc.py.no_gui Python-2.7.3/Lib/pydoc.py
 --- Python-2.7.3/Lib/pydoc.py.no_gui	2012-04-09 19:07:31.000000000 -0400
 +++ Python-2.7.3/Lib/pydoc.py	2013-02-19 13:48:44.480054515 -0500
 @@ -19,9 +19,6 @@ of all available modules.
- Run "pydoc -p <port>" to start an HTTP server on a given port on the
+ local machine to generate documentation web pages.  Port number 0 can be
- local machine to generate documentation web pages.
+ used to get an arbitrary unused port.
  
 -For platforms without a command line, "pydoc -g" starts the HTTP server
 -and also pops up a little window for controlling it.
@@ -11,19 +11,9 @@ diff -up Python-2.7.3/Lib/pydoc.py.no_gui Python-2.7.3/Lib/pydoc.py
  Run "pydoc -w <name>" to write out the HTML documentation for a module
  to a file named "<name>.html".
  
-@@ -2290,9 +2287,6 @@ def cli():
-         writing = 0
- 
-         for opt, val in opts:
--            if opt == '-g':
--                gui()
--                return
-             if opt == '-k':
-                 apropos(val)
-                 return
 @@ -2346,13 +2340,10 @@ def cli():
- %s -p <port>
+     Start an HTTP server on the given port on the local machine.  Port
-     Start an HTTP server on the given port on the local machine.
+     number 0 can be used to get an arbitrary unused port.
  
 -%s -g
 -    Pop up a graphical interface for finding and serving documentation.

00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch

@@ -6,6 +6,6 @@ diff -up Python-2.7.6/Lib/test/test_file2k.py.stdin-test Python-2.7.6/Lib/test/t
                  f.close()
  
 +    @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji')
-     def testStdin(self):
+     def testStdinSeek(self):
-         # This causes the interpreter to exit on OSF1 v5.1.
+         if sys.platform == 'osf1V5':
-         if sys.platform != 'osf1V5':
+             # This causes the interpreter to exit on OSF1 v5.1.

00153-fix-test_gdb-noise.patch

@@ -13,9 +13,9 @@
 +                    # Disable this:
 +                    'set print entry-values no',
 +
-                     'run']
+ 
-         if cmds_after_breakpoint:
+                     # The tests assume that the first frame of printed
-             commands += cmds_after_breakpoint
+                     #  backtrace will not contain program counter,
 --- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
 +++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
 @@ -144,6 +153,10 @@

00156-gdb-autoload-safepath.patch

@@ -21,11 +21,13 @@ diff -up Python-2.7.3/Lib/test/test_gdb.py.gdb-autoload-safepath Python-2.7.3/Li
  class DebuggerTests(unittest.TestCase):
  
      """Test that the debugger can debug Python."""
-@@ -112,15 +125,28 @@ class DebuggerTests(unittest.TestCase):
+diff -up Python-2.7.10/Lib/test/test_gdb.py.ms Python-2.7.10/Lib/test/test_gdb.py
-                     'set print entry-values no',
+--- Python-2.7.10/Lib/test/test_gdb.py.ms	2015-05-25 17:00:25.028462615 +0200
++++ Python-2.7.10/Lib/test/test_gdb.py	2015-05-25 17:01:53.166359822 +0200
+@@ -153,6 +153,17 @@ class DebuggerTests(unittest.TestCase):
  
                      'run']
-+
+ 
 +        if HAS_AUTOLOAD_SAFEPATH:
 +            # Recent GDBs will only auto-load scripts from certain safe
 +            # locations.
@@ -36,13 +38,16 @@ diff -up Python-2.7.3/Lib/test/test_gdb.py.gdb-autoload-safepath Python-2.7.3/Li
 +        else:
 +            init_commands = []
 +
-         if cmds_after_breakpoint:
++
-             commands += cmds_after_breakpoint
+         # GDB as of 7.4 onwards can distinguish between the
+         # value of a variable at entry vs current value:
+         #   http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
+@@ -167,10 +178,11 @@ class DebuggerTests(unittest.TestCase):
          else:
              commands += ['backtrace']
  
+-        # print commands
 +        # print init_commands
-         # print commands
  
          # Use "commands" to generate the arguments with which to invoke "gdb":
          args = ["gdb", "--batch", "-nx"]

00170-gc-assertions.patch

@@ -3,8 +3,8 @@ diff -up Python-2.7.3/Lib/test/test_gc.py.gc-assertions Python-2.7.3/Lib/test/te
 +++ Python-2.7.3/Lib/test/test_gc.py	2013-02-20 16:39:52.720489297 -0500
 @@ -1,6 +1,7 @@
  import unittest
--from test.test_support import verbose, run_unittest
+-from test.test_support import verbose, run_unittest, start_threads
-+from test.test_support import verbose, run_unittest, import_module
++from test.test_support import verbose, run_unittest, start_threads, import_module
  import sys
 +import sysconfig
  import time

python-2.5.1-plural-fix.patch

@@ -7,6 +7,6 @@ diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py
                          continue
 +                    if item.startswith("#"):
 +                        continue
+                     k = v = None
                      if ':' in item:
                          k, v = item.split(':', 1)
-                         k = k.strip().lower()

python.spec

@@ -107,8 +107,8 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python-docs when changing this:
-Version: 2.7.9
+Version: 2.7.10
-Release: 11%{?dist}
+Release: 1%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -2133,6 +2133,9 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Mon May 25 2015 Matej Stuchlik <mstuchli@redhat.com> - 2.7.10-1
+- Update to 2.7.10
+
 * Tue May  5 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.7.9-11
 - Disable test_gdb on aarch64 (rhbz#1196181), it joins all other non x86 arches