Skip to content

Commit

Permalink
Some master-only blackenings for 18.5b0
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed May 29, 2018
1 parent 3c90e2c commit 6efe46d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 4 additions & 2 deletions paramiko/ssh_gss.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
GSS_EXCEPTIONS = ()




#: :var str _API: Constraint for the used API
_API = "MIT"

Expand Down Expand Up @@ -163,6 +161,7 @@ def ssh_gss_oids(self, mode="client"):
"""
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))
Expand All @@ -178,6 +177,7 @@ def ssh_check_mech(self, desired_mech):
: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
Expand Down Expand Up @@ -271,6 +271,7 @@ def ssh_init_sec_context(
``None`` if no token was returned
"""
from pyasn1.codec.der import decoder

self._username = username
self._gss_host = target
targ_name = gssapi.Name(
Expand Down Expand Up @@ -446,6 +447,7 @@ def ssh_init_sec_context(
no token was returned
"""
from pyasn1.codec.der import decoder

self._username = username
self._gss_host = target
error = 0
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,5 @@
"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"],
)

0 comments on commit 6efe46d

Please sign in to comment.