From c091e756084ce017d8d872ffeaf95422f79140f1 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 29 May 2018 15:18:24 -0700
Subject: Blacken under black 18.5b0

---
 setup.py | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 6e1f0e0e..a427ccc3 100644
--- a/setup.py
+++ b/setup.py
@@ -19,12 +19,12 @@
 import sys
 from setuptools import setup
 
-if sys.platform == 'darwin':
+if sys.platform == "darwin":
     import setup_helper
 
     setup_helper.install_custom_make_tarball()
 
-longdesc = '''
+longdesc = """
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
 connections between python scripts.  All major ciphers and hash methods
@@ -35,14 +35,14 @@ Required packages:
 
 To install the development version, ``pip install -e
 git+https://github.com/paramiko/paramiko/#egg=paramiko``.
-'''
+"""
 
 
 # Version info -- read without importing
 _locals = {}
-with open('paramiko/_version.py') as fp:
+with open("paramiko/_version.py") as fp:
     exec(fp.read(), None, _locals)
-version = _locals['__version__']
+version = _locals["__version__"]
 
 setup(
     name="paramiko",
@@ -52,29 +52,29 @@ setup(
     author="Jeff Forcier",
     author_email="jeff@bitprophet.org",
     url="https://github.com/paramiko/paramiko/",
-    packages=['paramiko'],
-    license='LGPL',
-    platforms='Posix; MacOS X; Windows',
+    packages=["paramiko"],
+    license="LGPL",
+    platforms="Posix; MacOS X; Windows",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: '
-        'GNU Library or Lesser General Public License (LGPL)',
-        'Operating System :: OS Independent',
-        'Topic :: Internet',
-        'Topic :: Security :: Cryptography',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: "
+        "GNU Library or Lesser General Public License (LGPL)",
+        "Operating System :: OS Independent",
+        "Topic :: Internet",
+        "Topic :: Security :: Cryptography",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
     ],
     install_requires=[
-        'bcrypt>=3.1.3',
-        'cryptography>=1.5',
-        'pynacl>=1.0.1',
-        'pyasn1>=0.1.7',
+        "bcrypt>=3.1.3",
+        "cryptography>=1.5",
+        "pynacl>=1.0.1",
+        "pyasn1>=0.1.7",
     ],
 )
-- 
cgit v1.2.3


From 6efe46d6ab0ad2daba436dc0aaed29f57b13bd2c Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
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(-)

(limited to 'setup.py')

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