diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 19:43:32 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-12-14 19:43:32 -0800 |
| commit | 2010c948702bede77b752b3dbae86b8e6231475c (patch) | |
| tree | 40a7b7e2e0f02dee1b3eb83d0d97988799b96097 | |
| parent | 46a828db91dabcdf0a9ea035ff22a92a83ead496 (diff) | |
| parent | 113aa8e63498257f60f891928b46a72621e53210 (diff) | |
| download | paramiko-2010c948702bede77b752b3dbae86b8e6231475c.tar.gz | |
Merge branch '2.0' into 2.1
| -rw-r--r-- | paramiko/auth_handler.py | 12 | ||||
| -rw-r--r-- | paramiko/util.py | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/paramiko/auth_handler.py b/paramiko/auth_handler.py index a0c38ac6..646e9195 100644 --- a/paramiko/auth_handler.py +++ b/paramiko/auth_handler.py @@ -339,10 +339,14 @@ class AuthHandler(object): err_msg = m.get_string() m.get_string() # Lang tag - discarded raise SSHException( - "GSS-API Error:\nMajor Status: %s\n\ - Minor Status: %s\nError Message:\ - %s\n" - ) % (str(maj_status), str(min_status), err_msg) + """GSS-API Error: +Major Status: {} +Minor Status: {} +Error Message: {} +""".format( + maj_status, min_status, err_msg + ) + ) elif ptype == MSG_USERAUTH_FAILURE: self._parse_userauth_failure(m) return diff --git a/paramiko/util.py b/paramiko/util.py index 256ac7fb..1fb73da4 100644 --- a/paramiko/util.py +++ b/paramiko/util.py @@ -249,7 +249,8 @@ def log_to_file(filename, level=DEBUG): logger.setLevel(level) f = open(filename, "a") handler = logging.StreamHandler(f) - frm = "%(levelname)-.3s [%(asctime)s.%(msecs)03d] thr=%(_threadid)-3d %(name)s: %(message)s" # noqa + frm = "%(levelname)-.3s [%(asctime)s.%(msecs)03d] thr=%(_threadid)-3d" + frm += " %(name)s: %(message)s" handler.setFormatter(logging.Formatter(frm, "%Y%m%d-%H:%M:%S")) logger.addHandler(handler) |