Skip to content

Commit 9d243c1

Browse files
committed
Hide some attributes.
1 parent 8367fe0 commit 9d243c1

2 files changed

Lines changed: 32 additions & 34 deletions

File tree

‎language_tool/__init__.py‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ def _get_pos(self, y, x):
172172
class LanguageTool:
173173
"""Main class used for checking text against different rules
174174
"""
175-
HOST = socket.gethostbyname("localhost")
176-
MIN_PORT = 8081
177-
MAX_PORT = 8083
178-
TIMEOUT = 30
175+
_HOST = socket.gethostbyname("localhost")
176+
_MIN_PORT = 8081
177+
_MAX_PORT = 8083
178+
_TIMEOUT = 30
179179

180-
port = MIN_PORT
180+
_port = _MIN_PORT
181181
_server = None
182182
_instances = WeakValueDictionary()
183183
_PORT_RE = re.compile(r"port (\d+)", re.I)
@@ -226,22 +226,20 @@ def motherTongue(self, motherTongue):
226226
else LanguageTag(motherTongue))
227227

228228
@property
229-
def spell_checking_rules(self):
229+
def _spell_checking_rules(self):
230230
return {"HUNSPELL_RULE", "HUNSPELL_NO_SUGGEST_RULE",
231231
"MORFOLOGIK_RULE_" + self.language.replace("-", "_").upper()}
232232

233233
def check(self, text: str, srctext=None) -> [Match]:
234234
"""Match text against enabled rules.
235235
"""
236-
root = self._get_root(self.url, self._encode(text, srctext))
236+
root = self._get_root(self._url, self._encode(text, srctext))
237237
return [Match(e.attrib, text) for e in root]
238238

239-
def check_api(self, text: str, srctext=None) -> bytes:
240-
"""Match text against enabled rules.
241-
242-
Return result in XML format.
239+
def _check_api(self, text: str, srctext=None) -> bytes:
240+
"""Match text against enabled rules (result in XML format).
243241
"""
244-
root = self._get_root(self.url, self._encode(text, srctext))
242+
root = self._get_root(self._url, self._encode(text, srctext))
245243
return (b'<?xml version="1.0" encoding="UTF-8"?>\n' +
246244
ElementTree.tostring(root) + b"\n")
247245

@@ -281,7 +279,7 @@ def enable(self, rules: Sequence):
281279
def reset_disabled(self):
282280
"""Reset disabled rules.
283281
"""
284-
self.disabled = self.spell_checking_rules
282+
self.disabled = self._spell_checking_rules
285283

286284
def reset_enabled(self):
287285
"""Reset enabled rules.
@@ -293,22 +291,22 @@ def enable_spellchecking(self):
293291
"""
294292
if self.disabled is None:
295293
return
296-
for rule in self.spell_checking_rules:
294+
for rule in self._spell_checking_rules:
297295
self.disabled.remove(rule)
298296

299297
def disable_spellchecking(self):
300298
"""Disable spell-checking rules.
301299
"""
302300
if self.disabled is None:
303301
self.disabled = set()
304-
for rule in self.spell_checking_rules:
302+
for rule in self._spell_checking_rules:
305303
self.disabled.add(rule)
306304

307305
@classmethod
308306
def _get_languages(cls):
309307
if not cls._server_is_alive():
310308
cls._start_server_on_free_port()
311-
url = urllib.parse.urljoin(cls.url, "Languages")
309+
url = urllib.parse.urljoin(cls._url, "Languages")
312310
languages = set()
313311
for e in cls._get_root(url, num_tries=1):
314312
language = e.get("abbr")
@@ -330,31 +328,31 @@ def _get_languages(cls):
330328
def _get_root(cls, url, data=None, num_tries=2):
331329
for n in range(num_tries):
332330
try:
333-
with urlopen(url, data, cls.TIMEOUT) as f:
331+
with urlopen(url, data, cls._TIMEOUT) as f:
334332
return ElementTree.parse(f).getroot()
335333
except IOError as e:
336334
if n + 1 < num_tries:
337335
cls._start_server()
338336
else:
339-
raise Error("{}: {}".format(cls.url, e))
337+
raise Error("{}: {}".format(cls._url, e))
340338

341339
@classmethod
342340
def _start_server_on_free_port(cls):
343341
while True:
344-
cls.url = "http://{}:{}".format(cls.HOST, cls.port)
342+
cls._url = "http://{}:{}".format(cls._HOST, cls._port)
345343
try:
346344
cls._start_server()
347345
break
348346
except ServerError:
349-
if cls.MIN_PORT <= cls.port < cls.MAX_PORT:
350-
cls.port += 1
347+
if cls._MIN_PORT <= cls._port < cls._MAX_PORT:
348+
cls._port += 1
351349
else:
352350
raise
353351

354352
@classmethod
355353
def _start_server(cls):
356354
try:
357-
server_cmd = get_server_cmd(cls.port)
355+
server_cmd = get_server_cmd(cls._port)
358356
except PathError:
359357
# Can’t find path to LanguageTool.
360358
pass
@@ -371,32 +369,32 @@ def _start_server(cls):
371369
match = cls._PORT_RE.search(cls._server.stdout.readline())
372370
if match:
373371
port = int(match.group(1))
374-
if port != cls.port:
372+
if port != cls._port:
375373
raise Error("requested port {}, but got {}"
376-
.format(cls.port, port))
374+
.format(cls._port, port))
377375
else:
378376
cls._terminate_server()
379-
cls.err_msg = cls._server.communicate("")[1].strip()
377+
cls._err_msg = cls._server.communicate("")[1].strip()
380378
cls._server = None
381-
match = cls._PORT_RE.search(cls.err_msg)
379+
match = cls._PORT_RE.search(cls._err_msg)
382380
if not match:
383-
raise Error(cls.err_msg)
381+
raise Error(cls._err_msg)
384382
port = int(match.group(1))
385-
if port != cls.port:
386-
raise Error(cls.err_msg)
383+
if port != cls._port:
384+
raise Error(cls._err_msg)
387385
if not cls._server:
388386
# Couldn’t start the server, so maybe there is already one running.
389387
params = {"language": FAILSAFE_LANGUAGE, "text": ""}
390388
data = urllib.parse.urlencode(params).encode()
391389
try:
392-
with urlopen(cls.url, data, cls.TIMEOUT) as f:
390+
with urlopen(cls._url, data, cls._TIMEOUT) as f:
393391
tree = ElementTree.parse(f)
394392
except (IOError, http.client.HTTPException) as e:
395-
raise ServerError("{}: {}".format(cls.url, e))
393+
raise ServerError("{}: {}".format(cls._url, e))
396394
root = tree.getroot()
397395
if root.tag != "matches":
398396
raise ServerError("unexpected root from {}: {!r}"
399-
.format(cls.url, root.tag))
397+
.format(cls._url, root.tag))
400398

401399
@classmethod
402400
def _server_is_alive(cls):
@@ -480,7 +478,7 @@ def get_version():
480478
universal_newlines=True,
481479
startupinfo=startupinfo
482480
)
483-
out = proc.communicate("", LanguageTool.TIMEOUT)[0]
481+
out = proc.communicate("", LanguageTool._TIMEOUT)[0]
484482
match = version_re.search(out)
485483

486484
if not match:

‎language_tool/__main__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def main():
103103
lang_tool.enable(args.enable)
104104

105105
if args.api:
106-
print(lang_tool.check_api(text).decode("utf-8"))
106+
print(lang_tool._check_api(text).decode("utf-8"))
107107
elif args.apply:
108108
print(lang_tool.correct(text))
109109
else:

0 commit comments

Comments
 (0)