Skip to content

Commit 79c2d5b

Browse files
committed
Make "language-tool" script Python 2 compatible
1 parent 739e3fc commit 79c2d5b

4 files changed

Lines changed: 133 additions & 132 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ script:
1919
- if [ "$TRAVIS_PYTHON_VERSION" != "2.7" ]; then python test.py; fi
2020

2121
# Prevent Python 2.7 from using the non-3to2 converted code.
22-
- cd language_tool
23-
24-
- ../test.bash
22+
- cd language_tool; ../test.bash

‎language-tool‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎language-tool‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env python
2+
3+
import sys
4+
5+
from language_tool import main
6+
sys.exit(main.main())

‎language_tool/__main__.py‎

100755100644
Lines changed: 2 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,4 @@
1-
#!/usr/bin/env python
2-
3-
"""LanguageTool command line."""
4-
5-
import argparse
6-
import locale
7-
import os
8-
import re
91
import sys
102

11-
import language_tool.console_mode
12-
13-
DEFAULT_ENCODING = 'utf-8'
14-
15-
16-
def parse_args():
17-
parser = argparse.ArgumentParser(
18-
description=__doc__.strip(),
19-
prog='{} -m {}'.format(os.path.basename(sys.executable),
20-
'language_tool')
21-
)
22-
parser.add_argument('file',
23-
help='plain text file or "-" for stdin')
24-
parser.add_argument('-c', '--encoding',
25-
help='input encoding')
26-
parser.add_argument('-l', '--language', metavar='CODE',
27-
help='language code of the input or "auto"')
28-
parser.add_argument('-m', '--mother-tongue', metavar='CODE',
29-
help='language code of your first language')
30-
parser.add_argument('-d', '--disable', metavar='RULES', type=get_rules,
31-
action=RulesAction, default=set(),
32-
help='list of rule IDs to be disabled')
33-
parser.add_argument('-e', '--enable', metavar='RULES', type=get_rules,
34-
action=RulesAction, default=set(),
35-
help='list of rule IDs to be enabled')
36-
parser.add_argument('--api', action='store_true',
37-
help='print results as XML')
38-
parser.add_argument('--version', action='version',
39-
version='LanguageTool {} ({})'
40-
.format(language_tool.get_version(),
41-
language_tool.get_build_date()),
42-
help='show LanguageTool version and build date')
43-
parser.add_argument('-a', '--apply', action='store_true',
44-
help='automatically apply suggestions if available')
45-
parser.add_argument('-s', '--spell-check-off', dest='spell_check',
46-
action='store_false',
47-
help='disable spell-checking rules')
48-
return parser.parse_args()
49-
50-
51-
class RulesAction(argparse.Action):
52-
53-
def __call__(self, parser, namespace, values, option_string=None):
54-
getattr(namespace, self.dest).update(values)
55-
56-
57-
def get_rules(rules: str) -> set:
58-
return {rule.upper() for rule in re.findall(r"[\w\-]+", rules)}
59-
60-
61-
def get_text(file, encoding):
62-
with open(file, encoding=encoding) as f:
63-
text = ''.join(f.readlines())
64-
return text
65-
66-
67-
def main():
68-
args = parse_args()
69-
70-
if args.file == '-':
71-
file = sys.stdin.fileno()
72-
encoding = args.encoding or (
73-
sys.stdin.encoding if sys.stdin.isatty()
74-
else locale.getpreferredencoding()
75-
)
76-
else:
77-
file = args.file
78-
encoding = args.encoding or 'utf-8'
79-
80-
lang_tool = language_tool.LanguageTool(motherTongue=args.mother_tongue)
81-
guess_language = None
82-
83-
if args.language:
84-
if args.language.lower() == 'auto':
85-
try:
86-
from guess_language import guess_language
87-
except ImportError:
88-
print('guess_language is unavailable.', file=sys.stderr)
89-
return 1
90-
else:
91-
text = get_text(file, encoding)
92-
language = guess_language(text)
93-
if not args.api:
94-
print('Detected language: {}'.format(language),
95-
file=sys.stderr)
96-
if not language:
97-
return 1
98-
lang_tool.language = language
99-
else:
100-
lang_tool.language = args.language
101-
102-
if not guess_language:
103-
if not args.api:
104-
print('Language: {}'.format(lang_tool.language))
105-
text = get_text(file, encoding)
106-
107-
if not args.spell_check:
108-
lang_tool.disable_spellchecking()
109-
110-
lang_tool.disabled.update(args.disable)
111-
lang_tool.enabled.update(args.enable)
112-
113-
status = 0
114-
115-
if args.api:
116-
print(lang_tool._check_api(text).decode('utf-8'))
117-
elif args.apply:
118-
print(lang_tool.correct(text))
119-
else:
120-
print()
121-
for n, match in enumerate(lang_tool.check(text)):
122-
print('{}.) {}'.format(n + 1, match))
123-
print()
124-
status = 2
125-
126-
return status
127-
128-
129-
if __name__ == '__main__':
130-
sys.exit(main())
3+
from . import main
4+
sys.exit(main.main())

‎language_tool/main.py‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
"""LanguageTool command line."""
2+
3+
import argparse
4+
import locale
5+
import os
6+
import re
7+
import sys
8+
9+
import language_tool.console_mode
10+
11+
DEFAULT_ENCODING = 'utf-8'
12+
13+
14+
def parse_args():
15+
parser = argparse.ArgumentParser(
16+
description=__doc__.strip(),
17+
prog='{} -m {}'.format(os.path.basename(sys.executable),
18+
'language_tool')
19+
)
20+
parser.add_argument('file',
21+
help='plain text file or "-" for stdin')
22+
parser.add_argument('-c', '--encoding',
23+
help='input encoding')
24+
parser.add_argument('-l', '--language', metavar='CODE',
25+
help='language code of the input or "auto"')
26+
parser.add_argument('-m', '--mother-tongue', metavar='CODE',
27+
help='language code of your first language')
28+
parser.add_argument('-d', '--disable', metavar='RULES', type=get_rules,
29+
action=RulesAction, default=set(),
30+
help='list of rule IDs to be disabled')
31+
parser.add_argument('-e', '--enable', metavar='RULES', type=get_rules,
32+
action=RulesAction, default=set(),
33+
help='list of rule IDs to be enabled')
34+
parser.add_argument('--api', action='store_true',
35+
help='print results as XML')
36+
parser.add_argument('--version', action='version',
37+
version='LanguageTool {} ({})'
38+
.format(language_tool.get_version(),
39+
language_tool.get_build_date()),
40+
help='show LanguageTool version and build date')
41+
parser.add_argument('-a', '--apply', action='store_true',
42+
help='automatically apply suggestions if available')
43+
parser.add_argument('-s', '--spell-check-off', dest='spell_check',
44+
action='store_false',
45+
help='disable spell-checking rules')
46+
return parser.parse_args()
47+
48+
49+
class RulesAction(argparse.Action):
50+
51+
def __call__(self, parser, namespace, values, option_string=None):
52+
getattr(namespace, self.dest).update(values)
53+
54+
55+
def get_rules(rules: str) -> set:
56+
return {rule.upper() for rule in re.findall(r"[\w\-]+", rules)}
57+
58+
59+
def get_text(file, encoding):
60+
with open(file, encoding=encoding) as f:
61+
text = ''.join(f.readlines())
62+
return text
63+
64+
65+
def main():
66+
args = parse_args()
67+
68+
if args.file == '-':
69+
file = sys.stdin.fileno()
70+
encoding = args.encoding or (
71+
sys.stdin.encoding if sys.stdin.isatty()
72+
else locale.getpreferredencoding()
73+
)
74+
else:
75+
file = args.file
76+
encoding = args.encoding or 'utf-8'
77+
78+
lang_tool = language_tool.LanguageTool(motherTongue=args.mother_tongue)
79+
guess_language = None
80+
81+
if args.language:
82+
if args.language.lower() == 'auto':
83+
try:
84+
from guess_language import guess_language
85+
except ImportError:
86+
print('guess_language is unavailable.', file=sys.stderr)
87+
return 1
88+
else:
89+
text = get_text(file, encoding)
90+
language = guess_language(text)
91+
if not args.api:
92+
print('Detected language: {}'.format(language),
93+
file=sys.stderr)
94+
if not language:
95+
return 1
96+
lang_tool.language = language
97+
else:
98+
lang_tool.language = args.language
99+
100+
if not guess_language:
101+
if not args.api:
102+
print('Language: {}'.format(lang_tool.language))
103+
text = get_text(file, encoding)
104+
105+
if not args.spell_check:
106+
lang_tool.disable_spellchecking()
107+
108+
lang_tool.disabled.update(args.disable)
109+
lang_tool.enabled.update(args.enable)
110+
111+
status = 0
112+
113+
if args.api:
114+
print(lang_tool._check_api(text).decode('utf-8'))
115+
elif args.apply:
116+
print(lang_tool.correct(text))
117+
else:
118+
print()
119+
for n, match in enumerate(lang_tool.check(text)):
120+
print('{}.) {}'.format(n + 1, match))
121+
print()
122+
status = 2
123+
124+
return status

0 commit comments

Comments
 (0)