Skip to content

Commit 2bef241

Browse files
committed
LanguageTool: drop disable(), enable(), reset_disabled(), reset_enabled().
Favor direct manipulation of disabled and enabled attributes.
1 parent b4e503e commit 2bef241

2 files changed

Lines changed: 16 additions & 46 deletions

File tree

‎language_tool/__init__.py‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,13 @@ def __init__(self, language=None, motherTongue=None):
186186
self._start_server_on_free_port()
187187
if language is None:
188188
try:
189-
self.language = get_locale_language()
189+
language = get_locale_language()
190190
except ValueError:
191-
self.language = FAILSAFE_LANGUAGE
192-
else:
193-
self.language = language
191+
language = FAILSAFE_LANGUAGE
192+
self._language = LanguageTag(language)
194193
self.motherTongue = motherTongue
194+
self.disabled = self._spell_checking_rules
195+
self.enabled = set()
195196
self._instances[id(self)] = self
196197

197198
def __del__(self):
@@ -207,8 +208,9 @@ def language(self):
207208
@language.setter
208209
def language(self, language):
209210
self._language = LanguageTag(language)
210-
self.reset_disabled()
211-
self.reset_enabled()
211+
self.disabled.clear()
212+
self.enabled.clear()
213+
self.disable_spellchecking()
212214

213215
@property
214216
def motherTongue(self):
@@ -248,9 +250,9 @@ def _encode(self, text, srctext=None):
248250
params["srctext"] = srctext.encode("utf-8")
249251
if self.motherTongue is not None:
250252
params["motherTongue"] = self.motherTongue
251-
if self.disabled is not None:
253+
if self.disabled:
252254
params["disabled"] = ",".join(self.disabled)
253-
if self.enabled is not None:
255+
if self.enabled:
254256
params["enabled"] = ",".join(self.enabled)
255257
return urllib.parse.urlencode(params).encode()
256258

@@ -259,47 +261,15 @@ def correct(self, text: str, srctext=None) -> str:
259261
"""
260262
return correct(text, self.check(text, srctext))
261263

262-
def disable(self, rules: Sequence):
263-
"""Disable specified rules.
264-
"""
265-
if self.disabled is None:
266-
self.disabled = set()
267-
for rule in rules:
268-
self.disabled.add(rule)
269-
270-
def enable(self, rules: Sequence):
271-
"""Enable specified rules.
272-
"""
273-
if self.enabled is None:
274-
self.enabled = set()
275-
for rule in rules:
276-
self.enabled.add(rule)
277-
278-
def reset_disabled(self):
279-
"""Reset disabled rules.
280-
"""
281-
self.disabled = self._spell_checking_rules
282-
283-
def reset_enabled(self):
284-
"""Reset enabled rules.
285-
"""
286-
self.enabled = None
287-
288264
def enable_spellchecking(self):
289265
"""Enable spell-checking rules.
290266
"""
291-
if self.disabled is None:
292-
return
293-
for rule in self._spell_checking_rules:
294-
self.disabled.remove(rule)
267+
self.disabled.difference_update(self._spell_checking_rules)
295268

296269
def disable_spellchecking(self):
297270
"""Disable spell-checking rules.
298271
"""
299-
if self.disabled is None:
300-
self.disabled = set()
301-
for rule in self._spell_checking_rules:
302-
self.disabled.add(rule)
272+
self.disabled.update(self._spell_checking_rules)
303273

304274
@classmethod
305275
def _get_languages(cls):
@@ -527,9 +497,9 @@ def get_directory():
527497
try:
528498
language_tool_dir = cache["language_tool_dir"]
529499
except KeyError:
530-
def version_key(s):
500+
def version_key(string):
531501
return [int(e) if e.isdigit() else e
532-
for e in re.split(r"(\d+)", s)]
502+
for e in re.split(r"(\d+)", string)]
533503

534504
def get_lt_dir(base_dir):
535505
paths = [

‎language_tool/__main__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ def main():
9898
if args.spell_check:
9999
lang_tool.enable_spellchecking()
100100
if args.disable is not None:
101-
lang_tool.disable(args.disable)
101+
lang_tool.disabled.update(args.disable)
102102
if args.enable is not None:
103-
lang_tool.enable(args.enable)
103+
lang_tool.enabled.update(args.enable)
104104

105105
if args.api:
106106
print(lang_tool._check_api(text).decode("utf-8"))

0 commit comments

Comments
 (0)