@@ -318,6 +318,17 @@ def _get_languages(cls) -> set:
318318 languages .add (language )
319319 return languages
320320
321+ @classmethod
322+ def _get_version (cls ):
323+ """Get LanguageTool version (by querying the server).
324+ """
325+ if not cls ._server_is_alive ():
326+ cls ._start_server_on_free_port ()
327+ params = {"language" : FAILSAFE_LANGUAGE , "text" : "" }
328+ data = urllib .parse .urlencode (params ).encode ()
329+ root = cls ._get_root (cls ._url , data , num_tries = 1 )
330+ return root .get ("version" )
331+
321332 @classmethod
322333 def _get_root (cls , url , data = None , num_tries = 2 ):
323334 for n in range (num_tries ):
@@ -392,6 +403,10 @@ def _start_server(cls):
392403 if root .tag != "matches" :
393404 raise ServerError ("unexpected root from {}: {!r}"
394405 .format (cls ._url , root .tag ))
406+ # LanguageTool 1.9+
407+ #if root.get("software") != "LanguageTool":
408+ #raise ServerError("unexpected software from {}: {!r}"
409+ #.format(cls._url, root.get("software")))
395410
396411 @classmethod
397412 def _server_is_alive (cls ):
@@ -464,30 +479,12 @@ def get_version():
464479 try :
465480 return cache ["version" ]
466481 except KeyError :
467- version_re = re .compile (r"LanguageTool-?.*?(\S+)$" )
468-
469- # LanguageTool 1.9+
470- proc = subprocess .Popen (
471- get_version_cmd (),
472- stdin = subprocess .PIPE ,
473- stdout = subprocess .PIPE ,
474- stderr = subprocess .PIPE ,
475- universal_newlines = True ,
476- startupinfo = startupinfo
477- )
478- try :
479- outs = proc .communicate (timeout = LanguageTool ._TIMEOUT )[0 ]
480- except subprocess .TimeoutExpired :
481- proc .kill ()
482- errs = proc .communicate ()[1 ]
483- raise Error (errs )
484- match = version_re .search (outs )
485-
486- if not match :
487- match = version_re .search (get_directory ())
482+ version = LanguageTool ._get_version ()
483+ if not version :
484+ match = re .search (r"LanguageTool-?.*?(\S+)$" , get_directory ())
488485 if not match :
489- raise Error ("unexpected version output: {!r}" . format ( outs ) )
490- version = match .group (1 )
486+ raise Error ("couldn’t determine LanguageTool version" )
487+ version = match .group (1 )
491488 cache ["version" ] = version
492489 return version
493490
0 commit comments