Skip to content
Snippets Groups Projects
Commit e7990d2a authored by Jelmer Vernooij's avatar Jelmer Vernooij
Browse files

Copyright.add_files_paragraph(): Append after the last existing files paragraph.

parent 0991c8f1
No related branches found
No related tags found
1 merge request!102Copyright.add_files_paragraph(): Append after the last existing files paragraph
python-debian (0.1.46) UNRELEASED; urgency=medium
* Copyright.add_files_paragraph(): Append after the last existing
files paragraph.
-- Jelmer Vernooij <jelmer@debian.org> Fri, 08 Jul 2022 15:11:03 +0100
python-debian (0.1.45) unstable; urgency=medium python-debian (0.1.45) unstable; urgency=medium
[ Jelmer Vernooij ] [ Jelmer Vernooij ]
......
...@@ -251,7 +251,7 @@ class Copyright(object): ...@@ -251,7 +251,7 @@ class Copyright(object):
if isinstance(p, FilesParagraph): if isinstance(p, FilesParagraph):
last_i = i last_i = i
self.__paragraphs.insert(last_i + 1, paragraph) self.__paragraphs.insert(last_i + 1, paragraph)
self.__file.insert(last_i + 1, paragraph._underlying_paragraph) self.__file.insert(last_i + 2, paragraph._underlying_paragraph)
def all_license_paragraphs(self): def all_license_paragraphs(self):
# type: () -> Iterator[LicenseParagraph] # type: () -> Iterator[LicenseParagraph]
......
...@@ -476,11 +476,24 @@ class CopyrightTest(unittest.TestCase): ...@@ -476,11 +476,24 @@ class CopyrightTest(unittest.TestCase):
['bar/*'], 'CompanyB', copyright.License('Apache')) ['bar/*'], 'CompanyB', copyright.License('Apache'))
c.add_files_paragraph(files1) c.add_files_paragraph(files1)
c.add_files_paragraph(files2) c.add_files_paragraph(files2)
self.assertIs(files1, c.find_files_paragraph('foo/bar.cc')) paragraphs = list(c.all_files_paragraphs())
self.assertIs(files2, c.find_files_paragraph('bar/baz.cc')) self.assertIs(paragraphs[0], c.find_files_paragraph('foo/bar.cc'))
self.assertIs(paragraphs[1], c.find_files_paragraph('bar/baz.cc'))
self.assertIsNone(c.find_files_paragraph('baz/quux.cc')) self.assertIsNone(c.find_files_paragraph('baz/quux.cc'))
self.assertIsNone(c.find_files_paragraph('Makefile')) self.assertIsNone(c.find_files_paragraph('Makefile'))
self.assertEqual("""\
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: foo/*
Copyright: CompanyA
License: ISC
Files: bar/*
Copyright: CompanyB
License: Apache
""", c.dump())
def test_all_license_paragraphs(self): def test_all_license_paragraphs(self):
# type: () -> None # type: () -> None
c = copyright.Copyright(sequence=SIMPLE.splitlines(True)) c = copyright.Copyright(sequence=SIMPLE.splitlines(True))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment