Files
@ f4fa8e9b6783
Branch filter:
Location: kallithea/scripts/logformat.py - annotation
f4fa8e9b6783
1.7 KiB
text/x-python
i18n: be: fix syntax errors
Causing errors on 'msgmerge', both locally as by weblate, e.g.:
$ msgmerge --backup=none --previous --update kallithea/i18n/be/LC_MESSAGES/kallithea.po kallithea/i18n/kallithea.pot
kallithea/i18n/be/LC_MESSAGES/kallithea.po:1687: end-of-line within string
kallithea/i18n/be/LC_MESSAGES/kallithea.po:1687:6: syntax error
kallithea/i18n/be/LC_MESSAGES/kallithea.po:4343: end-of-line within string
kallithea/i18n/be/LC_MESSAGES/kallithea.po:4343:6: syntax error
msgmerge: found 4 fatal errors
Problem introduced in commit 0f00dfa682057beea0adc047e7979285c2dcbdb6.
Causing errors on 'msgmerge', both locally as by weblate, e.g.:
$ msgmerge --backup=none --previous --update kallithea/i18n/be/LC_MESSAGES/kallithea.po kallithea/i18n/kallithea.pot
kallithea/i18n/be/LC_MESSAGES/kallithea.po:1687: end-of-line within string
kallithea/i18n/be/LC_MESSAGES/kallithea.po:1687:6: syntax error
kallithea/i18n/be/LC_MESSAGES/kallithea.po:4343: end-of-line within string
kallithea/i18n/be/LC_MESSAGES/kallithea.po:4343:6: syntax error
msgmerge: found 4 fatal errors
Problem introduced in commit 0f00dfa682057beea0adc047e7979285c2dcbdb6.
8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 665dfa112f2c 8bc8366a6874 8bc8366a6874 665dfa112f2c | #!/usr/bin/env python2
import re
import sys
if len(sys.argv) < 2:
print 'Cleanup of superfluous % formatting of log statements.'
print 'Usage:'
print ''' hg revert `hg loc '*.py'|grep -v logformat.py` && scripts/logformat.py `hg loc '*.py'` && hg diff'''
raise SystemExit(1)
logre = r'''
(log\.(?:error|info|warning|debug)
[(][ \n]*
)
%s
(
[ \n]*[)]
)
'''
res = [
# handle % () - keeping spaces around the old %
(re.compile(logre % r'''("[^"]*"|'[^']*') ([\n ]*) % ([\n ]*) \( ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) \) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# handle % without () - keeping spaces around the old %
(re.compile(logre % r'''("[^"]*"|'[^']*') ([\n ]*) % ([\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove extra space if it is on next line
(re.compile(logre % r'''("[^"]*"|'[^']*') , (\n [ ]) ([ ][\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove extra space if it is on same line
(re.compile(logre % r'''("[^"]*"|'[^']*') , [ ]+ () ( [\n ]+) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove trailing , and space
(re.compile(logre % r'''("[^"]*"|'[^']*') , () ( [\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* [^(), \n] ) [ ,]*''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
]
for f in sys.argv[1:]:
s = open(f).read()
for r, t in res:
s = r.sub(t, s)
open(f, 'w').write(s)
|