2021-11-07 18:24:30 +00:00
|
|
|
Index: distlib-0.3.3/distlib/_backport/shutil.py
|
2020-10-08 03:48:25 +00:00
|
|
|
===================================================================
|
2021-11-07 18:24:30 +00:00
|
|
|
--- distlib-0.3.3.orig/distlib/_backport/shutil.py
|
|
|
|
|
+++ distlib-0.3.3/distlib/_backport/shutil.py
|
2020-10-08 03:48:25 +00:00
|
|
|
@@ -19,7 +19,7 @@ try:
|
|
|
|
|
except ImportError:
|
|
|
|
|
from collections import Callable
|
2019-03-08 14:46:09 +00:00
|
|
|
import errno
|
|
|
|
|
-from . import tarfile
|
|
|
|
|
+import tarfile
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
import bz2
|
2021-11-07 18:24:30 +00:00
|
|
|
Index: distlib-0.3.3/distlib/compat.py
|
2020-10-08 03:48:25 +00:00
|
|
|
===================================================================
|
2021-11-07 18:24:30 +00:00
|
|
|
--- distlib-0.3.3.orig/distlib/compat.py
|
|
|
|
|
+++ distlib-0.3.3/distlib/compat.py
|
|
|
|
|
@@ -313,10 +313,7 @@ except ImportError: # pragma: no cover
|
2019-03-08 14:46:09 +00:00
|
|
|
return 'IronPython'
|
|
|
|
|
return 'CPython'
|
|
|
|
|
|
|
|
|
|
-try:
|
|
|
|
|
- import sysconfig
|
|
|
|
|
-except ImportError: # pragma: no cover
|
|
|
|
|
- from ._backport import sysconfig
|
|
|
|
|
+import sysconfig
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
callable = callable
|
2021-11-07 18:24:30 +00:00
|
|
|
Index: distlib-0.3.3/setup.py
|
2020-10-08 03:48:25 +00:00
|
|
|
===================================================================
|
2021-11-07 18:24:30 +00:00
|
|
|
--- distlib-0.3.3.orig/setup.py
|
|
|
|
|
+++ distlib-0.3.3/setup.py
|
|
|
|
|
@@ -63,7 +63,6 @@ distutils.core.setup(
|
2019-03-08 14:46:09 +00:00
|
|
|
'distlib._backport',
|
|
|
|
|
],
|
|
|
|
|
package_data={
|
|
|
|
|
- 'distlib._backport': ['sysconfig.cfg'],
|
2021-11-07 18:24:30 +00:00
|
|
|
'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe',
|
|
|
|
|
't64-arm.exe', 'w64-arm.exe'],
|
2019-03-08 14:46:09 +00:00
|
|
|
},
|
2021-11-07 18:24:30 +00:00
|
|
|
Index: distlib-0.3.3/tests/distlib_tests.py
|
2020-10-08 03:48:25 +00:00
|
|
|
===================================================================
|
2021-11-07 18:24:30 +00:00
|
|
|
--- distlib-0.3.3.orig/tests/distlib_tests.py
|
|
|
|
|
+++ distlib-0.3.3/tests/distlib_tests.py
|
2020-10-08 03:48:25 +00:00
|
|
|
@@ -10,7 +10,6 @@ _ver = sys.version_info[:2]
|
2019-03-08 14:46:09 +00:00
|
|
|
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
|
2020-10-08 03:48:25 +00:00
|
|
|
@@ -23,6 +22,5 @@ from test_wheel import WheelTestCase
|
2019-03-08 14:46:09 +00:00
|
|
|
|
|
|
|
|
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)
|
2021-11-07 18:24:30 +00:00
|
|
|
Index: distlib-0.3.3/tests/test_shutil.py
|
2020-10-08 03:48:25 +00:00
|
|
|
===================================================================
|
2021-11-07 18:24:30 +00:00
|
|
|
--- 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
|
2019-03-08 14:46:09 +00:00
|
|
|
|
|
|
|
|
-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,
|