From 8a99c39d93085c72986ce6bd206501289b31c433 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Thu, 10 Mar 2016 08:49:37 -0800 Subject: [PATCH] switched to set(), use .add() instead of .append() --- tldp/doctypes/docbook4xml.py | 2 +- tldp/doctypes/docbook5xml.py | 2 +- tldp/doctypes/docbooksgml.py | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tldp/doctypes/docbook4xml.py b/tldp/doctypes/docbook4xml.py index c3fe25d..6435435 100644 --- a/tldp/doctypes/docbook4xml.py +++ b/tldp/doctypes/docbook4xml.py @@ -85,7 +85,7 @@ class Docbook4XML(BaseDoctype, SignatureChecker): s = '''"{config.docbook4xml_xsltproc}" > "{output.name_fo}" \\ "{config.docbook4xml_xslprint}" \\ "{output.validsource}"''' - self.removals.append(self.output.name_fo) + self.removals.add(self.output.name_fo) return self.shellscript(s, **kwargs) # -- this is conditionally built--see logic in make_name_pdf() below diff --git a/tldp/doctypes/docbook5xml.py b/tldp/doctypes/docbook5xml.py index d656008..dce6087 100644 --- a/tldp/doctypes/docbook5xml.py +++ b/tldp/doctypes/docbook5xml.py @@ -104,7 +104,7 @@ class Docbook5XML(BaseDoctype, SignatureChecker): s = '''"{config.docbook5xml_xsltproc}" > "{output.name_fo}" \\ "{config.docbook5xml_xslprint}" \\ "{output.validsource}"''' - self.removals.append(self.output.name_fo) + self.removals.add(self.output.name_fo) return self.shellscript(s, **kwargs) # -- this is conditionally built--see logic in make_name_pdf() below diff --git a/tldp/doctypes/docbooksgml.py b/tldp/doctypes/docbooksgml.py index 9413406..37aa543 100644 --- a/tldp/doctypes/docbooksgml.py +++ b/tldp/doctypes/docbooksgml.py @@ -68,6 +68,8 @@ class DocbookSGML(BaseDoctype, SignatureChecker): --no-clobber \\ --verbose \\ -- "index.sgml" "{source.dirname}/index.sgml"''' + indexsgml = os.path.join(self.source.dirname, 'index.sgml') + self.removals.add(indexsgml) return self.shellscript(s, **kwargs) @depends(move_blank_indexsgml_into_source) @@ -106,12 +108,9 @@ class DocbookSGML(BaseDoctype, SignatureChecker): --verbose \\ --force \\ -- "index.sgml" "{source.dirname}/index.sgml"''' - moved = self.shellscript(s, **kwargs) - if moved: - logger.debug("%s created %s", self.source.stem, indexsgml) - self.removals.append(indexsgml) - return True - return False + logger.debug("%s creating %s", self.source.stem, indexsgml) + self.removals.add(indexsgml) + return self.shellscript(s, **kwargs) @depends(move_indexsgml_into_source) def cleaned_indexsgml(self, **kwargs):