summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-requirements.txt2
-rw-r--r--paramiko/message.py2
-rw-r--r--paramiko/ssh_gss.py2
-rw-r--r--sites/www/changelog.rst2
4 files changed, 5 insertions, 3 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index f4f84748..1aa28e19 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -7,7 +7,7 @@ pytest-relaxed==1.1.5
pytest-xdist==1.28.0
mock==2.0.0
# Linting!
-flake8==3.6.0
+flake8==3.8.3
# Coverage!
coverage==3.7.1
codecov==1.6.3
diff --git a/paramiko/message.py b/paramiko/message.py
index dead3508..9771cfbc 100644
--- a/paramiko/message.py
+++ b/paramiko/message.py
@@ -275,7 +275,7 @@ class Message(object):
self.packet.write(s)
return self
- def add_list(self, l):
+ def add_list(self, l): # noqa: E741
"""
Add a list of strings to the stream. They are encoded identically to
a single string of values separated by commas. (Yes, really, that's
diff --git a/paramiko/ssh_gss.py b/paramiko/ssh_gss.py
index eaafe94b..5d4cb416 100644
--- a/paramiko/ssh_gss.py
+++ b/paramiko/ssh_gss.py
@@ -658,7 +658,7 @@ class _SSH_SSPI(_SSH_GSSAuth):
error, token = self._gss_ctxt.authorize(recv_token)
token = token[0].Buffer
except pywintypes.error as e:
- e.strerror += ", Target: {}".format(e, self._gss_host)
+ e.strerror += ", Target: {}".format(self._gss_host)
raise
if error == 0:
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index cfc0d9c2..e5c89ea3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+- :bug:`-` Fix incorrect string formatting causing unhelpful error message
+ annotation when using Kerberos/GSSAPI. (Thanks, newer version of flake8!)
- :bug:`1723` Fix incorrectly swapped order of ``p`` and ``q`` numbers when
loading OpenSSH-format RSA private keys. At minimum this should address a
slowdown when using such keys, and it also means Paramiko works with