@@ -161,15 +161,7 @@ class LanguageTool:
161161
162162 def __init__ (self , language = None , motherTongue = None ):
163163 if not self ._server_is_alive ():
164- while True :
165- try :
166- self ._start_server ()
167- break
168- except ServerError :
169- if self .MIN_PORT <= LanguageTool .port < self .MAX_PORT :
170- LanguageTool .port += 1
171- else :
172- raise
164+ self ._start_server_on_free_port ()
173165 if language is None :
174166 try :
175167 self .language = get_locale_language ()
@@ -210,9 +202,21 @@ def motherTongue(self, motherTongue):
210202 self ._motherTongue = (None if motherTongue is None
211203 else LanguageTag (motherTongue ))
212204
205+ @classmethod
206+ def _start_server_on_free_port (cls ):
207+ while True :
208+ cls .url = "http://{}:{}" .format (cls .HOST , cls .port )
209+ try :
210+ cls ._start_server ()
211+ break
212+ except ServerError :
213+ if cls .MIN_PORT <= cls .port < cls .MAX_PORT :
214+ cls .port += 1
215+ else :
216+ raise
217+
213218 @classmethod
214219 def _start_server (cls ):
215- cls .url = "http://{host}:{port}" .format (host = cls .HOST , port = cls .port )
216220 try :
217221 server_cmd = get_server_cmd (cls .port )
218222 except PathError :
@@ -273,58 +277,44 @@ def check(self, text: str, srctext=None) -> [Match]:
273277 """Tokenize the text into sentences and match those sentences
274278 against all currently active rules.
275279 """
276- params = {"language" : self .language , "text" : text }
280+ params = {"language" : self .language , "text" : text . encode ( "utf-8" ) }
277281 if srctext is not None :
278- params ["srctext" ] = srctext
282+ params ["srctext" ] = srctext . encode ( "utf-8" )
279283 if self .motherTongue is not None :
280284 params ["motherTongue" ] = self .motherTongue
281285 if self .enabled is not None :
282286 params ["enabled" ] = "," .join (self .enabled )
283287 if self .disabled is not None :
284288 params ["disabled" ] = "," .join (self .disabled )
285289 data = urllib .parse .urlencode (params ).encode ()
286- second_try = False
287- try :
288- while True :
289- try :
290- with closing (
291- urllib .request .urlopen (self .url , data , self .TIMEOUT )
292- ) as f :
293- tree = ElementTree .parse (f )
294- break
295- except IOError :
296- if second_try :
297- raise
298- second_try = True
299- self ._start_server ()
300- except IOError as e :
301- raise Error ("{}: {}" .format (self .url , e ))
302- return [Match (e .attrib , self .language ) for e in tree .getroot ()]
290+ root = self ._get_root (self .url , data )
291+ return [Match (e .attrib , self .language ) for e in root ]
303292
304293 @classmethod
305294 def _get_languages (cls ):
306- second_try = False
307- try :
308- while True :
309- try :
310- url = urllib .parse .urljoin (cls .url , "Languages" )
311- with closing (
312- urllib .request .urlopen (url , timeout = cls .TIMEOUT )
313- ) as f :
314- tree = ElementTree .parse (f )
315- break
316- except (IOError , AttributeError ):
317- if second_try :
318- raise
319- second_try = True
320- cls ._start_server ()
321- except IOError as e :
322- raise Error ("{}: {}" .format (url , e ))
295+ if not cls ._server_is_alive ():
296+ cls ._start_server_on_free_port ()
297+ url = urllib .parse .urljoin (cls .url , "Languages" )
298+ root = cls ._get_root (url , num_tries = 1 )
323299 return {
324300 LANGUAGE_TAGS_MAPPING .get (e .get ("name" ), e .get ("abbr" ))
325- for e in tree . getroot ()
301+ for e in root
326302 }
327303
304+ @classmethod
305+ def _get_root (cls , url , data = None , num_tries = 2 ):
306+ for n in range (num_tries ):
307+ try :
308+ with closing (
309+ urllib .request .urlopen (url , data , cls .TIMEOUT )
310+ ) as f :
311+ return ElementTree .parse (f ).getroot ()
312+ except IOError as e :
313+ if n + 1 < num_tries :
314+ cls ._start_server ()
315+ else :
316+ raise Error ("{}: {}" .format (cls .url , e ))
317+
328318
329319@total_ordering
330320class LanguageTag (str ):
0 commit comments