From 5839d96fbab68559a5311a73d10762eba264e0e7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Apr 2010 21:31:38 +0200 Subject: [PATCH] translations-status.py: Remove iffy setting of level from constructors. --- scripts/auxiliar/translations-status.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/auxiliar/translations-status.py b/scripts/auxiliar/translations-status.py index 6331f64b33..d96e5fd358 100755 --- a/scripts/auxiliar/translations-status.py +++ b/scripts/auxiliar/translations-status.py @@ -192,13 +192,6 @@ class TelyDocument (object): if m: self.sectioning = m.group (1) self.title = m.group (2) - # This is all quite ugly and hairy. The original code worked - # with @top node detection and each manual had its own @top - # node. Not any more. Declaring .tely / .texi files to be - # @top sort of works... - if self.top: - self.sectioning = 'top' - self.level = texi_level [self.sectioning] if not hasattr (self, 'language'): self.language = '' @@ -215,7 +208,12 @@ class TelyDocument (object): for t in include_re.findall (self.contents)] self.included_files = [p for p in included_files if os.path.exists (p)] + def get_level (self): + return texi_level [self.sectioning] + def print_title (self, section_number): + if not hasattr (self, 'level'): + self.level = self.get_level () return section_number.increase (self.level) + self.title @@ -313,6 +311,9 @@ setting to %d %%" % (self.filename, self.uptodate_percentage, alternative)) setting to %d %%" % (self.filename, self.uptodate_percentage, alternative)) self.uptodate_percentage = alternative + def get_level (self): + return texi_level ['top'] + def completeness (self, formats=['long'], translated=False): if translated: translation = self.translation @@ -436,7 +437,7 @@ setting to %d %%" % (self.filename, self.uptodate_percentage, alternative)) return s class IncludedTranslatedTelyDocument (TranslatedTelyDocument): - pass + get_level = TelyDocument.get_level class UntranslatedTelyDocument (TranslatedTelyDocument): def __init__ (self, filename, masterdocument, parent_translation=None): @@ -445,7 +446,7 @@ class UntranslatedTelyDocument (TranslatedTelyDocument): TranslatedTelyDocument.__init__ (self, filename, masterdocument, parent_translation) class IncludedUntranslatedTelyDocument (UntranslatedTelyDocument): - pass + get_level = TelyDocument.get_level class MasterTelyDocument (TelyDocument): def __init__ (self, @@ -468,6 +469,9 @@ class MasterTelyDocument (TelyDocument): self.includes = [IncludedMasterTelyDocument (f, self.translations) for f in self.included_files] + def get_level (self): + return texi_level ['top'] + def translated_factory (self, filename, parent): if os.path.exists (filename): return TranslatedTelyDocument (filename, self, parent) @@ -532,6 +536,7 @@ class MasterTelyDocument (TelyDocument): return s class IncludedMasterTelyDocument (MasterTelyDocument): + get_level = TelyDocument.get_level def translated_factory (self, filename, parent): if os.path.exists (filename): return IncludedTranslatedTelyDocument (filename, self, parent) -- 2.39.5