4848
4949__all__ = ["LanguageTool" , "Error" ,
5050 "get_languages" , "correct" , "get_version" , "get_version_info" ,
51- "get_language_tool_dir " , "set_language_tool_dir " ]
51+ "get_directory " , "set_directory " ]
5252
5353FAILSAFE_LANGUAGE = "en"
5454LANGUAGE_RE = re .compile (r"^([a-z]{2,3})(?:[_-]([a-z]{2}))?$" , re .I )
@@ -351,11 +351,12 @@ def _start_server_on_free_port(cls):
351351
352352 @classmethod
353353 def _start_server (cls ):
354+ err = None
354355 try :
355356 server_cmd = get_server_cmd (cls ._port )
356- except PathError :
357+ except PathError as e :
357358 # Can’t find path to LanguageTool.
358- pass
359+ err = e
359360 else :
360361 # Need to PIPE all handles: http://bugs.python.org/issue3905
361362 cls ._server = subprocess .Popen (
@@ -374,14 +375,14 @@ def _start_server(cls):
374375 .format (cls ._port , port ))
375376 else :
376377 cls ._terminate_server ()
377- cls . _err_msg = cls ._server .communicate ("" )[1 ].strip ()
378+ err_msg = cls ._server .communicate ("" )[1 ].strip ()
378379 cls ._server = None
379- match = cls ._PORT_RE .search (cls . _err_msg )
380+ match = cls ._PORT_RE .search (err_msg )
380381 if not match :
381- raise Error (cls . _err_msg )
382+ raise Error (err_msg )
382383 port = int (match .group (1 ))
383384 if port != cls ._port :
384- raise Error (cls . _err_msg )
385+ raise Error (err_msg )
385386 if not cls ._server :
386387 # Couldn’t start the server, so maybe there is already one running.
387388 params = {"language" : FAILSAFE_LANGUAGE , "text" : "" }
@@ -390,6 +391,8 @@ def _start_server(cls):
390391 with urlopen (cls ._url , data , cls ._TIMEOUT ) as f :
391392 tree = ElementTree .parse (f )
392393 except (IOError , http .client .HTTPException ) as e :
394+ if err :
395+ raise err
393396 raise ServerError ("{}: {}" .format (cls ._url , e ))
394397 root = tree .getroot ()
395398 if root .tag != "matches" :
@@ -482,7 +485,7 @@ def get_version():
482485 match = version_re .search (out )
483486
484487 if not match :
485- match = version_re .search (get_language_tool_dir ())
488+ match = version_re .search (get_directory ())
486489 if not match :
487490 raise Error ("unexpected version output: {!r}" .format (out ))
488491 version = match .group (1 )
@@ -518,7 +521,7 @@ def get_languages():
518521
519522
520523def get_languages_from_dir ():
521- rules_path = os .path .join (get_language_tool_dir (), "rules" )
524+ rules_path = os .path .join (get_directory (), "rules" )
522525 languages = {fn for fn in os .listdir (rules_path )
523526 if os .path .isdir (os .path .join (rules_path , fn )) and
524527 LANGUAGE_RE .match (fn )}
@@ -532,7 +535,7 @@ def get_languages_from_dir():
532535 return languages
533536
534537
535- def get_language_tool_dir ():
538+ def get_directory ():
536539 """Get LanguageTool directory.
537540 """
538541 try :
@@ -566,7 +569,7 @@ def get_lt_dir(base_dir):
566569 return language_tool_dir
567570
568571
569- def set_language_tool_dir (path = None ):
572+ def set_directory (path = None ):
570573 """Set LanguageTool directory.
571574 """
572575 terminate_server ()
@@ -606,12 +609,12 @@ def get_jar_info():
606609 raise JavaError ("can’t find Java" )
607610 jar_names = ["LanguageTool.jar" , "LanguageTool.uno.jar" ]
608611 for jar_name in jar_names :
609- jar_path = os .path .join (get_language_tool_dir (), jar_name )
612+ jar_path = os .path .join (get_directory (), jar_name )
610613 if os .path .isfile (jar_path ):
611614 break
612615 else :
613616 raise PathError ("can’t find {!r} in {!r}"
614- .format (jar_names [0 ], get_language_tool_dir ()))
617+ .format (jar_names [0 ], get_directory ()))
615618 cache ["jar_info" ] = java_path , jar_path
616619 return java_path , jar_path
617620
0 commit comments