From 6efe46d6ab0ad2daba436dc0aaed29f57b13bd2c Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 29 May 2018 16:02:09 -0700 Subject: Some master-only blackenings for 18.5b0 --- paramiko/ssh_gss.py | 6 ++++-- setup.py | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/paramiko/ssh_gss.py b/paramiko/ssh_gss.py index 31601381..3f299aee 100644 --- a/paramiko/ssh_gss.py +++ b/paramiko/ssh_gss.py @@ -42,8 +42,6 @@ GSS_AUTH_AVAILABLE = True GSS_EXCEPTIONS = () - - #: :var str _API: Constraint for the used API _API = "MIT" @@ -163,6 +161,7 @@ class _SSH_GSSAuth(object): """ from pyasn1.type.univ import ObjectIdentifier from pyasn1.codec.der import encoder + OIDs = self._make_uint32(1) krb5_OID = encoder.encode(ObjectIdentifier(self._krb5_mech)) OID_len = self._make_uint32(len(krb5_OID)) @@ -178,6 +177,7 @@ class _SSH_GSSAuth(object): :return: ``True`` if the given OID is supported, otherwise C{False} """ from pyasn1.codec.der import decoder + mech, __ = decoder.decode(desired_mech) if mech.__str__() != self._krb5_mech: return False @@ -271,6 +271,7 @@ class _SSH_GSSAPI(_SSH_GSSAuth): ``None`` if no token was returned """ from pyasn1.codec.der import decoder + self._username = username self._gss_host = target targ_name = gssapi.Name( @@ -446,6 +447,7 @@ class _SSH_SSPI(_SSH_GSSAuth): no token was returned """ from pyasn1.codec.der import decoder + self._username = username self._gss_host = target error = 0 diff --git a/setup.py b/setup.py index d26d1c3e..c8a0169c 100644 --- a/setup.py +++ b/setup.py @@ -71,9 +71,5 @@ setup( "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", ], - install_requires=[ - "bcrypt>=3.1.3", - "cryptography>=1.5", - "pynacl>=1.0.1", - ], + install_requires=["bcrypt>=3.1.3", "cryptography>=1.5", "pynacl>=1.0.1"], ) -- cgit v1.2.3