Cleanup: pep8
This commit is contained in:
@@ -120,8 +120,11 @@ def check(check_ctxt, msgs, key, msgsrc, settings):
|
|||||||
key[1][0].isalpha() and not key[1][0].isupper()):
|
key[1][0].isalpha() and not key[1][0].isupper()):
|
||||||
not_capitalized.add(key)
|
not_capitalized.add(key)
|
||||||
if end_point is not None:
|
if end_point is not None:
|
||||||
if (key[1].strip().endswith('.') and not key[1].strip().endswith('...') and
|
if (
|
||||||
key[1] not in settings.WARN_MSGID_END_POINT_ALLOWED):
|
key[1].strip().endswith('.') and
|
||||||
|
(not key[1].strip().endswith('...')) and
|
||||||
|
key[1] not in settings.WARN_MSGID_END_POINT_ALLOWED
|
||||||
|
):
|
||||||
end_point.add(key)
|
end_point.add(key)
|
||||||
if undoc_ops is not None:
|
if undoc_ops is not None:
|
||||||
if key[1] == settings.UNDOC_OPS_STR:
|
if key[1] == settings.UNDOC_OPS_STR:
|
||||||
@@ -183,8 +186,10 @@ def print_info(reports, pot):
|
|||||||
# if py_in_rna and key in py_in_rna:
|
# if py_in_rna and key in py_in_rna:
|
||||||
# _print("\t\t-> RNA message also used in py UI code!")
|
# _print("\t\t-> RNA message also used in py UI code!")
|
||||||
if spell_errors and spell_errors.get(key):
|
if spell_errors and spell_errors.get(key):
|
||||||
lines = ["\t\t-> {}: misspelled, suggestions are ({})".format(w, "'" + "', '".join(errs) + "'")
|
lines = [
|
||||||
for w, errs in spell_errors[key]]
|
"\t\t-> {}: misspelled, suggestions are ({})".format(w, "'" + "', '".join(errs) + "'")
|
||||||
|
for w, errs in spell_errors[key]
|
||||||
|
]
|
||||||
_print("\n".join(lines))
|
_print("\n".join(lines))
|
||||||
_print("\t\t{}".format("\n\t\t".join(pot.msgs[key].sources)))
|
_print("\t\t{}".format("\n\t\t".join(pot.msgs[key].sources)))
|
||||||
|
|
||||||
@@ -380,6 +385,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
|
|||||||
|
|
||||||
# Dump Messages
|
# Dump Messages
|
||||||
operator_categories = {}
|
operator_categories = {}
|
||||||
|
|
||||||
def process_cls_list(cls_list):
|
def process_cls_list(cls_list):
|
||||||
if not cls_list:
|
if not cls_list:
|
||||||
return
|
return
|
||||||
@@ -447,6 +453,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
|
|||||||
i18n_contexts = bpy.app.translations.contexts
|
i18n_contexts = bpy.app.translations.contexts
|
||||||
|
|
||||||
root_paths = tuple(bpy.utils.resource_path(t) for t in ('USER', 'LOCAL', 'SYSTEM'))
|
root_paths = tuple(bpy.utils.resource_path(t) for t in ('USER', 'LOCAL', 'SYSTEM'))
|
||||||
|
|
||||||
def make_rel(path):
|
def make_rel(path):
|
||||||
for rp in root_paths:
|
for rp in root_paths:
|
||||||
if path.startswith(rp):
|
if path.startswith(rp):
|
||||||
@@ -510,6 +517,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
|
|||||||
return [_extract_string_merge(estr_ls, nds_ls) for estr_ls, nds_ls in bag]
|
return [_extract_string_merge(estr_ls, nds_ls) for estr_ls, nds_ls in bag]
|
||||||
|
|
||||||
i18n_ctxt_ids = {v for v in bpy.app.translations.contexts_C_to_py.values()}
|
i18n_ctxt_ids = {v for v in bpy.app.translations.contexts_C_to_py.values()}
|
||||||
|
|
||||||
def _ctxt_to_ctxt(node):
|
def _ctxt_to_ctxt(node):
|
||||||
# We must try, to some extend, to get contexts from vars instead of only literal strings...
|
# We must try, to some extend, to get contexts from vars instead of only literal strings...
|
||||||
ctxt = extract_strings(node)[0]
|
ctxt = extract_strings(node)[0]
|
||||||
@@ -738,7 +746,9 @@ def dump_src_messages(msgs, reports, settings):
|
|||||||
pygettexts = tuple(re.compile(r).search for r in settings.PYGETTEXT_KEYWORDS)
|
pygettexts = tuple(re.compile(r).search for r in settings.PYGETTEXT_KEYWORDS)
|
||||||
|
|
||||||
_clean_str = re.compile(settings.str_clean_re).finditer
|
_clean_str = re.compile(settings.str_clean_re).finditer
|
||||||
clean_str = lambda s: "".join(m.group("clean") for m in _clean_str(s))
|
|
||||||
|
def clean_str(s):
|
||||||
|
return "".join(m.group("clean") for m in _clean_str(s))
|
||||||
|
|
||||||
def dump_src_file(path, rel_path, msgs, reports, settings):
|
def dump_src_file(path, rel_path, msgs, reports, settings):
|
||||||
def process_entry(_msgctxt, _msgid):
|
def process_entry(_msgctxt, _msgid):
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ from bpy.app.translations import locale_explode
|
|||||||
|
|
||||||
|
|
||||||
_valid_po_path_re = re.compile(r"^\S+:[0-9]+$")
|
_valid_po_path_re = re.compile(r"^\S+:[0-9]+$")
|
||||||
|
|
||||||
|
|
||||||
def is_valid_po_path(path):
|
def is_valid_po_path(path):
|
||||||
return bool(_valid_po_path_re.match(path))
|
return bool(_valid_po_path_re.match(path))
|
||||||
|
|
||||||
@@ -57,6 +59,7 @@ def get_best_similar(data):
|
|||||||
# We also consider to never make a match when len differs more than -len_key / 2, +len_key * 2 (which is valid
|
# We also consider to never make a match when len differs more than -len_key / 2, +len_key * 2 (which is valid
|
||||||
# as long as use_similar is not below ~0.7).
|
# as long as use_similar is not below ~0.7).
|
||||||
# Gives an overall ~20% of improvement!
|
# Gives an overall ~20% of improvement!
|
||||||
|
|
||||||
# tmp = difflib.get_close_matches(key[1], similar_pool, n=1, cutoff=use_similar)
|
# tmp = difflib.get_close_matches(key[1], similar_pool, n=1, cutoff=use_similar)
|
||||||
# if tmp:
|
# if tmp:
|
||||||
# tmp = tmp[0]
|
# tmp = tmp[0]
|
||||||
@@ -178,9 +181,11 @@ def enable_addons(addons=None, support=None, disable=False, check_only=False):
|
|||||||
userpref = bpy.context.user_preferences
|
userpref = bpy.context.user_preferences
|
||||||
used_ext = {ext.module for ext in userpref.addons}
|
used_ext = {ext.module for ext in userpref.addons}
|
||||||
|
|
||||||
ret = [mod for mod in addon_utils.modules()
|
ret = [
|
||||||
|
mod for mod in addon_utils.modules()
|
||||||
if ((addons and mod.__name__ in addons) or
|
if ((addons and mod.__name__ in addons) or
|
||||||
(not addons and addon_utils.module_bl_info(mod)["support"] in support))]
|
(not addons and addon_utils.module_bl_info(mod)["support"] in support))
|
||||||
|
]
|
||||||
|
|
||||||
if not check_only:
|
if not check_only:
|
||||||
for mod in ret:
|
for mod in ret:
|
||||||
@@ -229,18 +234,21 @@ class I18nMessage:
|
|||||||
|
|
||||||
def _get_msgctxt(self):
|
def _get_msgctxt(self):
|
||||||
return "".join(self.msgctxt_lines)
|
return "".join(self.msgctxt_lines)
|
||||||
|
|
||||||
def _set_msgctxt(self, ctxt):
|
def _set_msgctxt(self, ctxt):
|
||||||
self.msgctxt_lines = [ctxt]
|
self.msgctxt_lines = [ctxt]
|
||||||
msgctxt = property(_get_msgctxt, _set_msgctxt)
|
msgctxt = property(_get_msgctxt, _set_msgctxt)
|
||||||
|
|
||||||
def _get_msgid(self):
|
def _get_msgid(self):
|
||||||
return "".join(self.msgid_lines)
|
return "".join(self.msgid_lines)
|
||||||
|
|
||||||
def _set_msgid(self, msgid):
|
def _set_msgid(self, msgid):
|
||||||
self.msgid_lines = [msgid]
|
self.msgid_lines = [msgid]
|
||||||
msgid = property(_get_msgid, _set_msgid)
|
msgid = property(_get_msgid, _set_msgid)
|
||||||
|
|
||||||
def _get_msgstr(self):
|
def _get_msgstr(self):
|
||||||
return "".join(self.msgstr_lines)
|
return "".join(self.msgstr_lines)
|
||||||
|
|
||||||
def _set_msgstr(self, msgstr):
|
def _set_msgstr(self, msgstr):
|
||||||
self.msgstr_lines = [msgstr]
|
self.msgstr_lines = [msgstr]
|
||||||
msgstr = property(_get_msgstr, _set_msgstr)
|
msgstr = property(_get_msgstr, _set_msgstr)
|
||||||
@@ -251,11 +259,14 @@ class I18nMessage:
|
|||||||
return ([l[lstrip1:] for l in self.comment_lines if l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE)] +
|
return ([l[lstrip1:] for l in self.comment_lines if l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE)] +
|
||||||
[l[lstrip2:] for l in self.comment_lines
|
[l[lstrip2:] for l in self.comment_lines
|
||||||
if l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE_CUSTOM)])
|
if l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE_CUSTOM)])
|
||||||
|
|
||||||
def _set_sources(self, sources):
|
def _set_sources(self, sources):
|
||||||
cmmlines = self.comment_lines.copy()
|
cmmlines = self.comment_lines.copy()
|
||||||
for l in cmmlines:
|
for l in cmmlines:
|
||||||
if (l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE) or
|
if (
|
||||||
l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE_CUSTOM)):
|
l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE) or
|
||||||
|
l.startswith(self.settings.PO_COMMENT_PREFIX_SOURCE_CUSTOM)
|
||||||
|
):
|
||||||
self.comment_lines.remove(l)
|
self.comment_lines.remove(l)
|
||||||
lines_src = []
|
lines_src = []
|
||||||
lines_src_custom = []
|
lines_src_custom = []
|
||||||
@@ -1051,7 +1062,8 @@ class I18nMessages:
|
|||||||
import subprocess
|
import subprocess
|
||||||
with tempfile.NamedTemporaryFile(mode='w+', encoding="utf-8") as tmp_po_f:
|
with tempfile.NamedTemporaryFile(mode='w+', encoding="utf-8") as tmp_po_f:
|
||||||
self.write_messages_to_po(tmp_po_f)
|
self.write_messages_to_po(tmp_po_f)
|
||||||
cmd = (self.settings.GETTEXT_MSGFMT_EXECUTABLE,
|
cmd = (
|
||||||
|
self.settings.GETTEXT_MSGFMT_EXECUTABLE,
|
||||||
"--statistics", # show stats
|
"--statistics", # show stats
|
||||||
tmp_po_f.name,
|
tmp_po_f.name,
|
||||||
"-o",
|
"-o",
|
||||||
@@ -1081,6 +1093,7 @@ class I18nMessages:
|
|||||||
EOT = b"0x04" # Used to concatenate context and msgid
|
EOT = b"0x04" # Used to concatenate context and msgid
|
||||||
_msgid_offset = 0
|
_msgid_offset = 0
|
||||||
_msgstr_offset = 0
|
_msgstr_offset = 0
|
||||||
|
|
||||||
def _gen(v):
|
def _gen(v):
|
||||||
nonlocal _msgid_offset, _msgstr_offset
|
nonlocal _msgid_offset, _msgstr_offset
|
||||||
msgid = v.msgid.encode("utf-8")
|
msgid = v.msgid.encode("utf-8")
|
||||||
@@ -1188,6 +1201,7 @@ class I18n:
|
|||||||
|
|
||||||
def _py_file_get(self):
|
def _py_file_get(self):
|
||||||
return self.src.get(self.settings.PARSER_PY_ID)
|
return self.src.get(self.settings.PARSER_PY_ID)
|
||||||
|
|
||||||
def _py_file_set(self, value):
|
def _py_file_set(self, value):
|
||||||
self.src[self.settings.PARSER_PY_ID] = value
|
self.src[self.settings.PARSER_PY_ID] = value
|
||||||
py_file = property(_py_file_get, _py_file_set)
|
py_file = property(_py_file_get, _py_file_set)
|
||||||
@@ -1252,7 +1266,8 @@ class I18n:
|
|||||||
_ctx_txt = "s are"
|
_ctx_txt = "s are"
|
||||||
else:
|
else:
|
||||||
_ctx_txt = " is"
|
_ctx_txt = " is"
|
||||||
lines = (("",
|
lines = ((
|
||||||
|
"",
|
||||||
"Average stats for all {} translations:\n".format(self.nbr_trans),
|
"Average stats for all {} translations:\n".format(self.nbr_trans),
|
||||||
" {:>6.1%} done!\n".format(self.lvl / self.nbr_trans),
|
" {:>6.1%} done!\n".format(self.lvl / self.nbr_trans),
|
||||||
" {:>6.1%} of messages are tooltips.\n".format(self.lvl_ttips / self.nbr_trans),
|
" {:>6.1%} of messages are tooltips.\n".format(self.lvl_ttips / self.nbr_trans),
|
||||||
|
|||||||
@@ -14,9 +14,9 @@
|
|||||||
# along with this program; if not, write to the Free Software Foundation,
|
# along with this program; if not, write to the Free Software Foundation,
|
||||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
#
|
#
|
||||||
# Contributor(s): Campbell Barton
|
# ***** END GPL LICENSE BLOCK *****
|
||||||
#
|
|
||||||
# #**** END GPL LICENSE BLOCK #****
|
# <pep8 compliant>
|
||||||
|
|
||||||
defs = """
|
defs = """
|
||||||
SPACE_EMPTY,
|
SPACE_EMPTY,
|
||||||
|
|||||||
Reference in New Issue
Block a user