- bug 11254 fixed, now

Changed files:
    python3-bug11254.patch -> 1.3
    python3.spec -> 1.70

diff --git a/python3-bug11254.patch b/python3-bug11254.patch
deleted file mode 100644 (file)
index 09d5625..0000000
--- a/python3-bug11254.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' Python-3.2.1.orig/Lib/distutils/tests/test_build_py.py Python-3.2.1/Lib/distutils/tests/test_build_py.py
---- Python-3.2.1.orig/Lib/distutils/tests/test_build_py.py     2011-07-09 08:58:47.000000000 +0200
-+++ Python-3.2.1/Lib/distutils/tests/test_build_py.py  2011-07-15 13:55:54.000000000 +0200
-@@ -3,6 +3,7 @@
- import os
- import sys
- import io
-+import imp
- import unittest
- 
- from distutils.command.build_py import build_py
-@@ -57,13 +58,15 @@
-         self.assertEqual(len(cmd.get_outputs()), 3)
-         pkgdest = os.path.join(destination, "pkg")
-         files = os.listdir(pkgdest)
-+        byte_compiled_files = os.listdir(os.path.join(pkgdest, "__pycache__"))
-         self.assertIn("__init__.py", files)
-         self.assertIn("README.txt", files)
-+        init_pyc = "__init__.{}.pyc".format(imp.get_tag())
-         # XXX even with -O, distutils writes pyc, not pyo; bug?
-         if sys.dont_write_bytecode:
--            self.assertNotIn("__init__.pyc", files)
-+            self.assertNotIn(init_pyc, byte_compiled_files)
-         else:
--            self.assertIn("__init__.pyc", files)
-+            self.assertIn(init_pyc, byte_compiled_files)
- 
-     def test_empty_package_dir(self):
-         # See SF 1668596/1720897.
-diff -dur -x '*~' -x '*.orig' -x '*.rej' Python-3.2.1.orig/Lib/distutils/tests/test_install_lib.py Python-3.2.1/Lib/distutils/tests/test_install_lib.py
---- Python-3.2.1.orig/Lib/distutils/tests/test_install_lib.py  2011-07-09 08:58:47.000000000 +0200
-+++ Python-3.2.1/Lib/distutils/tests/test_install_lib.py       2011-07-15 13:53:50.000000000 +0200
-@@ -1,6 +1,7 @@
- """Tests for distutils.command.install_data."""
- import sys
- import os
-+import imp
- import unittest
- 
- from distutils.command.install_lib import install_lib
-@@ -36,14 +37,19 @@
-                          'byte-compile not supported')
-     def test_byte_compile(self):
-         pkg_dir, dist = self.create_dist()
-+        cache_dir = os.path.join(pkg_dir, '__pycache__')
-         cmd = install_lib(dist)
-         cmd.compile = cmd.optimize = 1
- 
-         f = os.path.join(pkg_dir, 'foo.py')
-         self.write_file(f, '# python file')
-         cmd.byte_compile([f])
--        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
--        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
-+        compiled_file = os.path.join(cache_dir,
-+                                     "foo.{}.pyc".format(imp.get_tag()))
-+        optimized_file = os.path.join(cache_dir,
-+                                      "foo.{}.pyo".format(imp.get_tag()))
-+        self.assertTrue(os.path.exists(compiled_file))
-+        self.assertTrue(os.path.exists(optimized_file))
- 
-     def test_get_outputs(self):
-         pkg_dir, dist = self.create_dist()
-diff -dur -x '*~' -x '*.orig' -x '*.rej' Python-3.2.1.orig/Lib/distutils/util.py Python-3.2.1/Lib/distutils/util.py
---- Python-3.2.1.orig/Lib/distutils/util.py    2011-07-09 08:58:47.000000000 +0200
-+++ Python-3.2.1/Lib/distutils/util.py 2011-07-15 13:53:50.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- __revision__ = "$Id$"
- 
--import sys, os, string, re
-+import sys, os, string, re, imp
- from distutils.errors import DistutilsPlatformError
- from distutils.dep_util import newer
- from distutils.spawn import spawn
-@@ -531,7 +531,7 @@
-             # Terminology from the py_compile module:
-             #   cfile - byte-compiled file
-             #   dfile - purported source filename (same as 'file' by default)
--            cfile = file + (__debug__ and "c" or "o")
-+            cfile = imp.cache_from_source(file, debug_override=not optimize)
-             dfile = file
-             if prefix:
-                 if file[:len(prefix)] != prefix:

diff --git a/python3.spec b/python3.spec
index 12b80fdbdca1f4feafeb7488c99b25624f66e89a..81afba139b61bac388020288cb22bd2ec2a022b7 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -44,8 +44,7 @@ Patch0:               %{name}-pythonpath.patch
 Patch1:                %{name}-ac_fixes.patch
 Patch2:                %{name}-lib64.patch
 Patch3:                %{name}-noarch_to_datadir.patch
-Patch4:                %{name}-bug11254.patch
-Patch5:                %{name}-no_cmdline_tests.patch
+Patch4:                %{name}-no_cmdline_tests.patch
 URL:           http://www.python.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: bluez-libs-devel
@@ -446,7 +445,6 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__autoconf}