15
0
Files
python-distlib/remove-backports.patch

74 lines
2.8 KiB
Diff
Raw Normal View History

Index: distlib-0.3.3/distlib/_backport/shutil.py
===================================================================
--- distlib-0.3.3.orig/distlib/_backport/shutil.py
+++ distlib-0.3.3/distlib/_backport/shutil.py
@@ -19,7 +19,7 @@ try:
except ImportError:
from collections import Callable
import errno
-from . import tarfile
+import tarfile
try:
import bz2
Index: distlib-0.3.3/distlib/compat.py
===================================================================
--- distlib-0.3.3.orig/distlib/compat.py
+++ distlib-0.3.3/distlib/compat.py
@@ -313,10 +313,7 @@ except ImportError: # pragma: no cover
return 'IronPython'
return 'CPython'
-try:
- import sysconfig
-except ImportError: # pragma: no cover
- from ._backport import sysconfig
+import sysconfig
try:
callable = callable
Index: distlib-0.3.3/setup.py
===================================================================
--- distlib-0.3.3.orig/setup.py
+++ distlib-0.3.3/setup.py
@@ -63,7 +63,6 @@ distutils.core.setup(
'distlib._backport',
],
package_data={
- 'distlib._backport': ['sysconfig.cfg'],
'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe',
't64-arm.exe', 'w64-arm.exe'],
},
Index: distlib-0.3.3/tests/distlib_tests.py
===================================================================
--- distlib-0.3.3.orig/tests/distlib_tests.py
+++ distlib-0.3.3/tests/distlib_tests.py
@@ -10,7 +10,6 @@ _ver = sys.version_info[:2]
from test_database import (DataFilesTestCase, TestDatabase, TestDistribution,
TestEggInfoDistribution, DepGraphTestCase)
from test_index import PackageIndexTestCase
-from test_locators import LocatorTestCase
from test_manifest import ManifestTestCase
from test_markers import MarkersTestCase
from test_metadata import MetadataTestCase, LegacyMetadataTestCase
@@ -23,6 +22,5 @@ from test_wheel import WheelTestCase
if _ver == (2, 6):
from test_shutil import TestCopyFile, TestMove, TestShutil
- from test_sysconfig import TestSysConfig, MakefileTests
from test_util import (UtilTestCase, ProgressTestCase, FileOpsTestCase,
GlobTestCase)
Index: distlib-0.3.3/tests/test_shutil.py
===================================================================
--- distlib-0.3.3.orig/tests/test_shutil.py
+++ distlib-0.3.3/tests/test_shutil.py
@@ -19,7 +19,7 @@ import tempfile
from compat import unittest, find_executable, spawn
from support import DistlibTestCase
-from distlib._backport import shutil, tarfile
+from distlib._backport import shutil; import tarfile
from distlib._backport.shutil import (
_make_tarball, _make_zipfile, make_archive, unpack_archive,
register_archive_format, unregister_archive_format, get_archive_formats,