From 840aaebd3e2b008233ef53c8026be2201a4e39fd Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sat, 26 Apr 2008 15:04:14 +0200 Subject: [PATCH] Python buildscripts style nits - convert TAB to 4 spaces, - for foo in bar.keys () -> for foo in bar - make check_translation.py and translations-status.py executables --- buildscripts/add_html_footer.py | 10 +-- buildscripts/check_translation.py | 8 +-- buildscripts/html-gettext.py | 106 ++++++++++++++-------------- buildscripts/makelsr.py | 2 +- buildscripts/output-distance.py | 2 +- buildscripts/texi-gettext.py | 64 ++++++++--------- buildscripts/translations-status.py | 14 ++-- 7 files changed, 103 insertions(+), 103 deletions(-) mode change 100644 => 100755 buildscripts/check_translation.py mode change 100644 => 100755 buildscripts/translations-status.py diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index 3c1bf0a225..00b48dc6ba 100644 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@ -79,7 +79,7 @@ def build_pages_dict (filelist): e = '' else: e = g[1] - if not g[0] in pages_dict.keys(): + if not g[0] in pages_dict: pages_dict[g[0]] = [e] else: pages_dict[g[0]].append (e) @@ -202,7 +202,7 @@ def process_links (s, prefix, lang_ext, file_name, missing, target): return page_flavors def add_menu (page_flavors, prefix, available, target, translation): - for k in page_flavors.keys(): + for k in page_flavors: language_menu = '' languages = '' if page_flavors[k][0] != '': @@ -280,9 +280,9 @@ def add_html_footer (package_name = '', page_flavors = add_menu (page_flavors, prefix, available, target, translation) subst = dict ([i for i in globals().items() if type (i[1]) is str]) subst.update (dict ([i for i in locals().items() if type (i[1]) is str])) - for k in page_flavors.keys(): - if page_flavors[k][0] in translation.keys(): - for name in subst.keys(): + for k in page_flavors: + if page_flavors[k][0] in translation: + for name in subst: subst[name] = translation[page_flavors[k][0]] (subst[name]) subst['footer_name_version'] = subst['footer_name_version'] % subst subst['footer_report_errors'] = subst['footer_report_errors'] % subst diff --git a/buildscripts/check_translation.py b/buildscripts/check_translation.py old mode 100644 new mode 100755 index 6952b2c34f..a0ac7d48cc --- a/buildscripts/check_translation.py +++ b/buildscripts/check_translation.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!/usr/bin/env python import __main__ import optparse @@ -35,7 +35,7 @@ def do_file (file_name, lang_codes, buildlib): (diff_string, error) = buildlib.check_translated_doc (original, translated_contents, color=not update_mode) if error: - sys.stderr.write ('warning: %s: %s' % (file_name, error)) + sys.stderr.write ('warning: %s: %s' % (file_name, error)) if update_mode: if error or len (diff_string) >= os.path.getsize (original): @@ -89,7 +89,7 @@ def main (): global update_mode, text_editor import_path, files = do_options () - if 'EDITOR' in os.environ.keys (): + if 'EDITOR' in os.environ: text_editor = os.environ['EDITOR'] else: update_mode = False @@ -100,7 +100,7 @@ def main (): buildlib.verbose = verbose for i in files: - do_file (i, langdefs.LANGDICT.keys(), buildlib) + do_file (i, langdefs.LANGDICT.keys (), buildlib) if __name__ == '__main__': main () diff --git a/buildscripts/html-gettext.py b/buildscripts/html-gettext.py index a63fc3c359..7d32879a41 100644 --- a/buildscripts/html-gettext.py +++ b/buildscripts/html-gettext.py @@ -20,79 +20,79 @@ files = args [1:] outdir = '.' for x in optlist: - if x[0] == '-o': - outdir = x[1] + if x[0] == '-o': + outdir = x[1] double_punct_char_separator = langdefs.LANGDICT[lang].double_punct_char_sep my_gettext = langdefs.translation[lang] html_codes = ((' -- ', ' – '), - (' --- ', ' — ')) + (' --- ', ' — ')) html2texi = {'command': (re.compile (r'(.*?)'), r'@command{\1}'), - 'code': (re.compile (r'(.*?)'), r'@code{\1}') - } + 'code': (re.compile (r'(.*?)'), r'@code{\1}') + } texi2html = {'command': (re.compile (r'@command{(.*?)}'), r'\1'), - 'code': (re.compile (r'@code{(.*?)}'), r'\1') - } + 'code': (re.compile (r'@code{(.*?)}'), r'\1') + } whitespaces = re.compile (r'\s+') def _ (s): - if not s: - return '' - s = whitespaces.sub (' ', s) - for c in html_codes: - s = s.replace (c[1], c[0]) - for u in html2texi.values(): - s = u[0].sub (u[1], s) - s = my_gettext (s) - for u in texi2html.values(): - s = u[0].sub (u[1], s) - for c in html_codes: - s = s.replace (c[0], c[1]) - return s + if not s: + return '' + s = whitespaces.sub (' ', s) + for c in html_codes: + s = s.replace (c[1], c[0]) + for u in html2texi.values(): + s = u[0].sub (u[1], s) + s = my_gettext (s) + for u in texi2html.values(): + s = u[0].sub (u[1], s) + for c in html_codes: + s = s.replace (c[0], c[1]) + return s def link_gettext (m): - return '' + return '' def title_gettext (m): - return '' + _(m.group(1)) + ' - ' + m.group(2) + '' + return '' + _(m.group(1)) + ' - ' + m.group(2) + '' def a_href_gettext (m): - s = '' - if m.group(0)[-1] == ':': - s = double_punct_char_separator + ':' - t = '' - if m.lastindex == 7: - t = m.group(7) - return '' + s + s = '' + if m.group(0)[-1] == ':': + s = double_punct_char_separator + ':' + t = '' + if m.lastindex == 7: + t = m.group(7) + return '' + s def h_gettext (m): - if m.group (3): - s = _(m.group(3)) - else: - s= '' - return '' + s +\ - m.group(4) + _(m.group(5)) + '' + if m.group (3): + s = _(m.group(3)) + else: + s= '' + return '' + s +\ + m.group(4) + _(m.group(5)) + '' def crossmanual_ref_gettext (m): - return '' + _(m.group(2)) + '' + return '' + _(m.group(2)) + '' for filename in files: - f = open (filename, 'r') - page = f.read () - f.close() - page = re.sub (r'', link_gettext, page) - page = re.sub (r'([^<]*?) - ([^<]*?)', title_gettext, page) - # ugh - page = re.sub (r'(?ms))()?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)):?', a_href_gettext, page) - page = re.sub (r'(Appendix |)([A-Z\d.]+ |)?([^<]+)', h_gettext, page) - page = re.sub (r'(.+?)', crossmanual_ref_gettext, page) - # this is necessary for entries not translated by a_href_gettext - page = re.sub (r'(.+?)', crossmanual_ref_gettext, page) - for w in ('Next:', 'Previous:', 'Up:'): - page = re.sub (w, _(w), page) - page = langdefs.LANGDICT[lang].html_filter (page) - f = open (os.path.join (outdir, filename), 'w') - f.write (page) - f.close () + f = open (filename, 'r') + page = f.read () + f.close() + page = re.sub (r'', link_gettext, page) + page = re.sub (r'([^<]*?) - ([^<]*?)', title_gettext, page) + # ugh + page = re.sub (r'(?ms))()?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)):?', a_href_gettext, page) + page = re.sub (r'(Appendix |)([A-Z\d.]+ |)?([^<]+)', h_gettext, page) + page = re.sub (r'(.+?)', crossmanual_ref_gettext, page) + # this is necessary for entries not translated by a_href_gettext + page = re.sub (r'(.+?)', crossmanual_ref_gettext, page) + for w in ('Next:', 'Previous:', 'Up:'): + page = re.sub (w, _(w), page) + page = langdefs.LANGDICT[lang].html_filter (page) + f = open (os.path.join (outdir, filename), 'w') + f.write (page) + f.close () diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py index 52983ea811..df3f1237b2 100755 --- a/buildscripts/makelsr.py +++ b/buildscripts/makelsr.py @@ -103,7 +103,7 @@ def read_source_with_dirs (src): srcdir = os.path.join (src, tag) l[tag] = set (map (os.path.basename, glob.glob (os.path.join (srcdir, '*.ly')))) for f in l[tag]: - if f in s.keys (): + if f in s: s[f][1].append (tag) else: s[f] = (srcdir, [tag]) diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py index fffade13f3..fed9aafcbe 100644 --- a/buildscripts/output-distance.py +++ b/buildscripts/output-distance.py @@ -773,7 +773,7 @@ def paired_files (dir1, dir2, pattern): pairs = [] missing = [] - for f in files[0].keys (): + for f in files[0]: try: files[1].pop (f) pairs.append (f) diff --git a/buildscripts/texi-gettext.py b/buildscripts/texi-gettext.py index 8fbc2243b7..546819b155 100644 --- a/buildscripts/texi-gettext.py +++ b/buildscripts/texi-gettext.py @@ -22,8 +22,8 @@ files = args[1:] outdir = '.' for x in optlist: - if x[0] == '-o': - outdir = x[1] + if x[0] == '-o': + outdir = x[1] double_punct_char_separator = langdefs.LANGDICT[lang].double_punct_char_sep _doc = langdefs.translation[lang] @@ -35,43 +35,43 @@ node_section_re = re.compile (r'@(node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec menu_entry_re = re.compile (r'\* (.*?)::') def title_gettext (m): - if m.group (2) == '{': - r = whitespaces.sub (' ', m.group (3)) - else: - r = m.group (3) - return '@' + m.group (1) + m.group (2) + _doc (r) + m.group (4) + if m.group (2) == '{': + r = whitespaces.sub (' ', m.group (3)) + else: + r = m.group (3) + return '@' + m.group (1) + m.group (2) + _doc (r) + m.group (4) def menu_entry_gettext (m): - return '* ' + _doc (m.group (1)) + '::' + return '* ' + _doc (m.group (1)) + '::' def include_replace (m, filename): - if os.path.exists (os.path.join (os.path.dirname (filename), m.group(1)) + '.texi'): - return '@include ' + m.group(1) + '.pdftexi' - return m.group(0) + if os.path.exists (os.path.join (os.path.dirname (filename), m.group(1)) + '.texi'): + return '@include ' + m.group(1) + '.pdftexi' + return m.group(0) def process_file (filename): - print "Processing %s" % filename - f = open (filename, 'r') - page = f.read () - f.close() - page = node_section_re.sub (title_gettext, page) - page = ref_re.sub (title_gettext, page) - page = menu_entry_re.sub (menu_entry_gettext, page) - page = page.replace ("""-- SKELETON FILE -- + print "Processing %s" % filename + f = open (filename, 'r') + page = f.read () + f.close() + page = node_section_re.sub (title_gettext, page) + page = ref_re.sub (title_gettext, page) + page = menu_entry_re.sub (menu_entry_gettext, page) + page = page.replace ("""-- SKELETON FILE -- When you actually translate this file, please remove these lines as well as all `UNTRANSLATED NODE: IGNORE ME' lines.""", '') - page = page.replace ('UNTRANSLATED NODE: IGNORE ME', _doc ("This section has not been translated yet; please refer to the manual in English.")) - includes = include_re.findall (page) - page = include_re.sub (lambda m: include_replace (m, filename), page) - p = os.path.join (outdir, filename) [:-4] + 'pdftexi' - f = open (p, 'w') - f.write (page) - f.close () - dir = os.path.dirname (filename) - for file in includes: - p = os.path.join (dir, file) + '.texi' - if os.path.exists (p): - process_file (p) + page = page.replace ('UNTRANSLATED NODE: IGNORE ME', _doc ("This section has not been translated yet; please refer to the manual in English.")) + includes = include_re.findall (page) + page = include_re.sub (lambda m: include_replace (m, filename), page) + p = os.path.join (outdir, filename) [:-4] + 'pdftexi' + f = open (p, 'w') + f.write (page) + f.close () + dir = os.path.dirname (filename) + for file in includes: + p = os.path.join (dir, file) + '.texi' + if os.path.exists (p): + process_file (p) for filename in files: - process_file (filename) + process_file (filename) diff --git a/buildscripts/translations-status.py b/buildscripts/translations-status.py old mode 100644 new mode 100755 index 7a8d8bb225..9db307d1ef --- a/buildscripts/translations-status.py +++ b/buildscripts/translations-status.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!/usr/bin/env python """ USAGE: translations-status.py BUILDSCRIPT-DIR LOCALEDIR @@ -310,13 +310,13 @@ class TranslatedTelyDocument (TelyDocument): return '' class MasterTelyDocument (TelyDocument): - def __init__ (self, filename, parent_translations=dict ([(lang, None) for lang in langdefs.LANGDICT.keys()])): + def __init__ (self, filename, parent_translations=dict ([(lang, None) for lang in langdefs.LANGDICT])): TelyDocument.__init__ (self, filename) self.size = len (self.contents) self.word_count = tely_word_count (self.contents) - translations = dict ([(lang, os.path.join (lang, filename)) for lang in langdefs.LANGDICT.keys()]) + translations = dict ([(lang, os.path.join (lang, filename)) for lang in langdefs.LANGDICT]) self.translations = dict ([(lang, TranslatedTelyDocument (translations[lang], self, parent_translations.get (lang))) - for lang in langdefs.LANGDICT.keys() if os.path.exists (translations[lang])]) + for lang in langdefs.LANGDICT if os.path.exists (translations[lang])]) if self.translations: self.includes = [MasterTelyDocument (f, self.translations) for f in self.included_files] else: @@ -335,7 +335,7 @@ class MasterTelyDocument (TelyDocument): s = '''''' % self.print_title (numbering) - s += ''.join ([' \n' % l for l in self.translations.keys ()]) + s += ''.join ([' \n' % l for l in self.translations]) s += ' \n' s += ' \n \n' \ % sum (self.word_count) @@ -359,7 +359,7 @@ class MasterTelyDocument (TelyDocument): s = '' if self.level[1] == 0: # if self is a master document s += (self.print_title (numbering) + ' ').ljust (colspec[0]) - s += ''.join (['%s'.ljust (colspec[1]) % l for l in self.translations.keys ()]) + s += ''.join (['%s'.ljust (colspec[1]) % l for l in self.translations]) s += '\n' s += ('Section titles (%d)' % sum (self.word_count)).ljust (colspec[0]) @@ -396,7 +396,7 @@ main_status_page = open ('translations.template.html.in').read () ## TODO #per_lang_status_pages = dict ([(l, open (os.path.join (l, 'translations.template.html')). read ()) -# for l in langdefs.LANGDICT.keys () +# for l in langdefs.LANGDICT # if langdefs.LANGDICT[l].enabled]) progress ("Generating status pages...") -- 2.39.5
%s%s%s
Section titles
(%d)