@@ -82,14 +82,6 @@ def get_text(filename, encoding, ignore):
8282 return text
8383
8484
85- def print_unicode (text ):
86- """Print in a portable manner."""
87- if sys .version_info [0 ] < 3 :
88- text = text .encode ('utf-8' )
89-
90- print (text )
91-
92-
9385def main ():
9486 args = parse_args ()
9587
@@ -114,34 +106,17 @@ def main():
114106 if args .remote_port is not None :
115107 remote_server += ':{}' .format (args .remote_port )
116108 lang_tool = LanguageTool (
109+ language = args .language ,
117110 motherTongue = args .mother_tongue ,
118111 remote_server = remote_server ,
119112 )
120- guess_language = None
121113
122114 try :
123115 text = get_text (filename , encoding , ignore = args .ignore_lines )
124116 except UnicodeError as exception :
125117 print ('{}: {}' .format (filename , exception ), file = sys .stderr )
126118 continue
127119
128- if args .language :
129- if args .language .lower () == 'auto' :
130- try :
131- from guess_language import guess_language
132- except ImportError :
133- print ('guess_language is unavailable.' , file = sys .stderr )
134- return 1
135- else :
136- language = guess_language (text )
137- print ('Detected language: {}' .format (language ),
138- file = sys .stderr )
139- if not language :
140- return 1
141- lang_tool .language = language
142- else :
143- lang_tool .language = args .language
144-
145120 if not args .spell_check :
146121 lang_tool .disable_spellchecking ()
147122
@@ -151,7 +126,7 @@ def main():
151126
152127 try :
153128 if args .apply :
154- print_unicode (lang_tool .correct (text ))
129+ print (lang_tool .correct (text ))
155130 else :
156131 for match in lang_tool .check (text ):
157132 rule_id = match .ruleId
@@ -167,7 +142,7 @@ def main():
167142 if replacement_text and not message .endswith (('.' , '?' )):
168143 message += '; suggestions: ' + replacement_text
169144
170- print_unicode ('{}: {}: {}' .format (
145+ print ('{}: {}: {}' .format (
171146 filename ,
172147 rule_id ,
173148 message ))
0 commit comments