mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/python-debian: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,2 +1 @@
|
||||
DIST python-debian_0.1.37.tar.xz 308568 BLAKE2B 7747ed21d3d6e06d5342ace6de83b79a93c76e44e8fd6d5738575e154f6d55dacd5dbb27d0210fac6f0a9db95b6d95b1fb9106da64ffbe7f77ec9d1a3e829d49 SHA512 0c13d6ee008bdcdfc28ac35d031a8486994a79a90d6b817349f09936c798211333604fd967bfde720fbc6b089bbec8e52b8c0977c430517e6f8c23d370fdff7c
|
||||
DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
|
||||
|
||||
@@ -1,140 +0,0 @@
|
||||
From 76b7c4e7d16e8f792323f8d14ebdb1678d9d12b0 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Sat, 30 Nov 2019 23:18:05 -0500
|
||||
Subject: [PATCH] Disable apt_pkg support
|
||||
|
||||
---
|
||||
lib/debian/deb822.py | 4 +--
|
||||
lib/debian/tests/test_deb822.py | 53 ---------------------------------
|
||||
2 files changed, 2 insertions(+), 55 deletions(-)
|
||||
|
||||
diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
|
||||
index c679f4b..2e85956 100644
|
||||
--- a/lib/debian/deb822.py
|
||||
+++ b/lib/debian/deb822.py
|
||||
@@ -1913,7 +1913,7 @@ class Sources(Dsc, _PkgRelationMixin):
|
||||
def iter_paragraphs(cls,
|
||||
sequence, # type: IterableInputDataType
|
||||
fields=None, # type: Optional[List[str]]
|
||||
- use_apt_pkg=True, # type: bool
|
||||
+ use_apt_pkg=False, # type: bool
|
||||
shared_storage=False, # type: bool
|
||||
encoding="utf-8", # type: str
|
||||
strict=None, # type: Optional[Dict]
|
||||
@@ -1955,7 +1955,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
|
||||
def iter_paragraphs(cls,
|
||||
sequence, # type: IterableInputDataType
|
||||
fields=None, # type: Optional[List[str]]
|
||||
- use_apt_pkg=True, # type: bool
|
||||
+ use_apt_pkg=False, # type: bool
|
||||
shared_storage=False, # type: bool
|
||||
encoding="utf-8", # type: str
|
||||
strict=None, # type: Optional[Dict]
|
||||
diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
|
||||
index 7101727..64a724c 100755
|
||||
--- a/lib/debian/tests/test_deb822.py
|
||||
+++ b/lib/debian/tests/test_deb822.py
|
||||
@@ -40,8 +40,6 @@ else:
|
||||
from StringIO import StringIO
|
||||
BytesIO = StringIO
|
||||
|
||||
-import apt_pkg #type: ignore
|
||||
-
|
||||
from debian import deb822
|
||||
from debian.debian_support import Version
|
||||
|
||||
@@ -465,11 +463,6 @@ class TestDeb822(unittest.TestCase):
|
||||
for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
|
||||
self.assertWellParsed(d, PARSED_PACKAGE)
|
||||
|
||||
- with self.assertWarns(UserWarning):
|
||||
- # The StringIO is not a real file so this will raise a warning
|
||||
- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
|
||||
- self.assertWellParsed(d, PARSED_PACKAGE)
|
||||
-
|
||||
def test_iter_paragraphs_file(self):
|
||||
text = StringIO()
|
||||
text.write(UNPARSED_PACKAGE)
|
||||
@@ -487,10 +480,6 @@ class TestDeb822(unittest.TestCase):
|
||||
for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
|
||||
self.assertWellParsed(d, PARSED_PACKAGE)
|
||||
|
||||
- fh.seek(0)
|
||||
- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
|
||||
- self.assertWellParsed(d, PARSED_PACKAGE)
|
||||
-
|
||||
|
||||
def test_iter_paragraphs_with_gpg(self):
|
||||
for string in GPG_SIGNED:
|
||||
@@ -556,12 +545,7 @@ class TestDeb822(unittest.TestCase):
|
||||
test_count(deb822.Deb822.iter_paragraphs, 2)
|
||||
test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
|
||||
|
||||
- # apt_pkg used, should not split
|
||||
- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
|
||||
-
|
||||
# Specialised iter_paragraphs force use of apt_pkg and don't split
|
||||
- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
|
||||
- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
|
||||
test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
|
||||
test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
|
||||
|
||||
@@ -607,27 +591,11 @@ class TestDeb822(unittest.TestCase):
|
||||
s.write(b"\n")
|
||||
self.assertEqual(s.getvalue(), packages_content)
|
||||
|
||||
- def test_iter_paragraphs_apt_shared_storage_packages(self):
|
||||
- self._test_iter_paragraphs(find_test_file("test_Packages"),
|
||||
- deb822.Packages,
|
||||
- use_apt_pkg=True, shared_storage=True)
|
||||
- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
|
||||
- self._test_iter_paragraphs(find_test_file("test_Packages"),
|
||||
- deb822.Packages,
|
||||
- use_apt_pkg=True, shared_storage=False)
|
||||
def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
|
||||
self._test_iter_paragraphs(find_test_file("test_Packages"),
|
||||
deb822.Packages,
|
||||
use_apt_pkg=False, shared_storage=False)
|
||||
|
||||
- def test_iter_paragraphs_apt_shared_storage_sources(self):
|
||||
- self._test_iter_paragraphs(find_test_file("test_Sources"),
|
||||
- deb822.Sources,
|
||||
- use_apt_pkg=True, shared_storage=True)
|
||||
- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
|
||||
- self._test_iter_paragraphs(find_test_file("test_Sources"),
|
||||
- deb822.Sources,
|
||||
- use_apt_pkg=True, shared_storage=False)
|
||||
def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
|
||||
self._test_iter_paragraphs(find_test_file("test_Sources"),
|
||||
deb822.Sources,
|
||||
@@ -973,27 +941,6 @@ Description: python modules to work with Debian-related data formats
|
||||
self.assertWellParsed(paragraphs[i],
|
||||
PARSED_PARAGRAPHS_WITH_COMMENTS[i])
|
||||
|
||||
- def test_iter_paragraphs_comments_use_apt_pkg(self):
|
||||
- """ apt_pkg does not support comments within multiline fields
|
||||
-
|
||||
- This test checks that a file with comments inside multiline fields
|
||||
- generates an error from the apt_pkg parser.
|
||||
-
|
||||
- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
|
||||
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
|
||||
- """
|
||||
- try:
|
||||
- fd, filename = tempfile.mkstemp()
|
||||
- fp = os.fdopen(fd, 'wb')
|
||||
- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
|
||||
- fp.close()
|
||||
-
|
||||
- with open_utf8(filename) as fh:
|
||||
- with self.assertRaises(apt_pkg.Error):
|
||||
- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
|
||||
- finally:
|
||||
- os.remove(filename)
|
||||
-
|
||||
def test_iter_paragraphs_comments_native(self):
|
||||
paragraphs = list(deb822.Deb822.iter_paragraphs(
|
||||
UNPARSED_PARAGRAPHS_WITH_COMMENTS.splitlines(), use_apt_pkg=False))
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
# Copyright 2011-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python modules to work with Debian-related data formats"
|
||||
HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
|
||||
SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/chardet[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
BDEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( app-arch/dpkg )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/0.1.36-disable-apt-pkg.patch" )
|
||||
|
||||
python_compile_all() {
|
||||
${EPYTHON} lib/debian/doc-debtags > README.debtags || die
|
||||
}
|
||||
|
||||
python_test() {
|
||||
${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}"
|
||||
}
|
||||
Reference in New Issue
Block a user