Blacken Paramiko on 2.4

kapsh · May 17, 2018 · 7f2c350 · 7f2c350
1 parent 5255132
commit 7f2c350
Show file tree

Hide file tree

Showing 63 changed files with 4,042 additions and 3,032 deletions.
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
@@ -21,15 +21,22 @@
 from paramiko._version import __version__, __version_info__
 from paramiko.transport import SecurityOptions, Transport
 from paramiko.client import (
-    SSHClient, MissingHostKeyPolicy, AutoAddPolicy, RejectPolicy,
+    SSHClient,
+    MissingHostKeyPolicy,
+    AutoAddPolicy,
+    RejectPolicy,
     WarningPolicy,
 )
 from paramiko.auth_handler import AuthHandler
 from paramiko.ssh_gss import GSSAuth, GSS_AUTH_AVAILABLE, GSS_EXCEPTIONS
 from paramiko.channel import Channel, ChannelFile
 from paramiko.ssh_exception import (
-    SSHException, PasswordRequiredException, BadAuthenticationType,
-    ChannelException, BadHostKeyException, AuthenticationException,
+    SSHException,
+    PasswordRequiredException,
+    BadAuthenticationType,
+    ChannelException,
+    BadHostKeyException,
+    AuthenticationException,
     ProxyCommandFailure,
 )
 from paramiko.server import ServerInterface, SubsystemHandler, InteractiveQuery
@@ -54,14 +61,25 @@
 from paramiko.proxy import ProxyCommand
 
 from paramiko.common import (
-    AUTH_SUCCESSFUL, AUTH_PARTIALLY_SUCCESSFUL, AUTH_FAILED, OPEN_SUCCEEDED,
-    OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED, OPEN_FAILED_CONNECT_FAILED,
-    OPEN_FAILED_UNKNOWN_CHANNEL_TYPE, OPEN_FAILED_RESOURCE_SHORTAGE,
+    AUTH_SUCCESSFUL,
+    AUTH_PARTIALLY_SUCCESSFUL,
+    AUTH_FAILED,
+    OPEN_SUCCEEDED,
+    OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED,
+    OPEN_FAILED_CONNECT_FAILED,
+    OPEN_FAILED_UNKNOWN_CHANNEL_TYPE,
+    OPEN_FAILED_RESOURCE_SHORTAGE,
 )
 
 from paramiko.sftp import (
-    SFTP_OK, SFTP_EOF, SFTP_NO_SUCH_FILE, SFTP_PERMISSION_DENIED, SFTP_FAILURE,
-    SFTP_BAD_MESSAGE, SFTP_NO_CONNECTION, SFTP_CONNECTION_LOST,
+    SFTP_OK,
+    SFTP_EOF,
+    SFTP_NO_SUCH_FILE,
+    SFTP_PERMISSION_DENIED,
+    SFTP_FAILURE,
+    SFTP_BAD_MESSAGE,
+    SFTP_NO_CONNECTION,
+    SFTP_CONNECTION_LOST,
     SFTP_OP_UNSUPPORTED,
 )
 
@@ -72,41 +90,41 @@
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 __all__ = [
-    'Transport',
-    'SSHClient',
-    'MissingHostKeyPolicy',
-    'AutoAddPolicy',
-    'RejectPolicy',
-    'WarningPolicy',
-    'SecurityOptions',
-    'SubsystemHandler',
-    'Channel',
-    'PKey',
-    'RSAKey',
-    'DSSKey',
-    'Message',
-    'SSHException',
-    'AuthenticationException',
-    'PasswordRequiredException',
-    'BadAuthenticationType',
-    'ChannelException',
-    'BadHostKeyException',
-    'ProxyCommand',
-    'ProxyCommandFailure',
-    'SFTP',
-    'SFTPFile',
-    'SFTPHandle',
-    'SFTPClient',
-    'SFTPServer',
-    'SFTPError',
-    'SFTPAttributes',
-    'SFTPServerInterface',
-    'ServerInterface',
-    'BufferedFile',
-    'Agent',
-    'AgentKey',
-    'HostKeys',
-    'SSHConfig',
-    'util',
-    'io_sleep',
+    "Transport",
+    "SSHClient",
+    "MissingHostKeyPolicy",
+    "AutoAddPolicy",
+    "RejectPolicy",
+    "WarningPolicy",
+    "SecurityOptions",
+    "SubsystemHandler",
+    "Channel",
+    "PKey",
+    "RSAKey",
+    "DSSKey",
+    "Message",
+    "SSHException",
+    "AuthenticationException",
+    "PasswordRequiredException",
+    "BadAuthenticationType",
+    "ChannelException",
+    "BadHostKeyException",
+    "ProxyCommand",
+    "ProxyCommandFailure",
+    "SFTP",
+    "SFTPFile",
+    "SFTPHandle",
+    "SFTPClient",
+    "SFTPServer",
+    "SFTPError",
+    "SFTPAttributes",
+    "SFTPServerInterface",
+    "ServerInterface",
+    "BufferedFile",
+    "Agent",
+    "AgentKey",
+    "HostKeys",
+    "SSHConfig",
+    "util",
+    "io_sleep",
 ]
diff --git a/paramiko/_version.py b/paramiko/_version.py
@@ -1,2 +1,2 @@
 __version_info__ = (2, 4, 1)
-__version__ = '.'.join(map(str, __version_info__))
+__version__ = ".".join(map(str, __version_info__))
diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py
@@ -15,6 +15,7 @@
 ######################
 # jaraco.windows.error
 
+
 def format_system_message(errno):
     """
     Call FormatMessage with a system error number to retrieve
@@ -77,7 +78,7 @@ def __str__(self):
         return self.message
 
     def __repr__(self):
-        return '{self.__class__.__name__}({self.winerror})'.format(**vars())
+        return "{self.__class__.__name__}({self.winerror})".format(**vars())
 
 
 def handle_nonzero_success(result):
@@ -124,11 +125,7 @@ def handle_nonzero_success(result):
 UnmapViewOfFile.argtypes = ctypes.wintypes.HANDLE,
 
 RtlMoveMemory = ctypes.windll.kernel32.RtlMoveMemory
-RtlMoveMemory.argtypes = (
-    ctypes.c_void_p,
-    ctypes.c_void_p,
-    ctypes.c_size_t,
-)
+RtlMoveMemory.argtypes = (ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t)
 
 ctypes.windll.kernel32.LocalFree.argtypes = ctypes.wintypes.HLOCAL,
 
@@ -140,6 +137,7 @@ class MemoryMap(object):
     """
     A memory map object which can have security attributes overridden.
     """
+
     def __init__(self, name, length, security_attributes=None):
         self.name = name
         self.length = length
@@ -149,14 +147,20 @@ def __init__(self, name, length, security_attributes=None):
     def __enter__(self):
         p_SA = (
             ctypes.byref(self.security_attributes)
-            if self.security_attributes else None
+            if self.security_attributes
+            else None
         )
         INVALID_HANDLE_VALUE = -1
         PAGE_READWRITE = 0x4
         FILE_MAP_WRITE = 0x2
         filemap = ctypes.windll.kernel32.CreateFileMappingW(
-            INVALID_HANDLE_VALUE, p_SA, PAGE_READWRITE, 0, self.length,
-            u(self.name))
+            INVALID_HANDLE_VALUE,
+            p_SA,
+            PAGE_READWRITE,
+            0,
+            self.length,
+            u(self.name),
+        )
         handle_nonzero_success(filemap)
         if filemap == INVALID_HANDLE_VALUE:
             raise Exception("Failed to create file mapping")
@@ -220,41 +224,45 @@ def __exit__(self, exc_type, exc_val, tb):
 POLICY_NOTIFICATION = 0x00001000
 
 POLICY_ALL_ACCESS = (
-    STANDARD_RIGHTS_REQUIRED |
-    POLICY_VIEW_LOCAL_INFORMATION |
-    POLICY_VIEW_AUDIT_INFORMATION |
-    POLICY_GET_PRIVATE_INFORMATION |
-    POLICY_TRUST_ADMIN |
-    POLICY_CREATE_ACCOUNT |
-    POLICY_CREATE_SECRET |
-    POLICY_CREATE_PRIVILEGE |
-    POLICY_SET_DEFAULT_QUOTA_LIMITS |
-    POLICY_SET_AUDIT_REQUIREMENTS |
-    POLICY_AUDIT_LOG_ADMIN |
-    POLICY_SERVER_ADMIN |
-    POLICY_LOOKUP_NAMES)
+    STANDARD_RIGHTS_REQUIRED
+    | POLICY_VIEW_LOCAL_INFORMATION
+    | POLICY_VIEW_AUDIT_INFORMATION
+    | POLICY_GET_PRIVATE_INFORMATION
+    | POLICY_TRUST_ADMIN
+    | POLICY_CREATE_ACCOUNT
+    | POLICY_CREATE_SECRET
+    | POLICY_CREATE_PRIVILEGE
+    | POLICY_SET_DEFAULT_QUOTA_LIMITS
+    | POLICY_SET_AUDIT_REQUIREMENTS
+    | POLICY_AUDIT_LOG_ADMIN
+    | POLICY_SERVER_ADMIN
+    | POLICY_LOOKUP_NAMES
+)
 
 
 POLICY_READ = (
-    STANDARD_RIGHTS_READ |
-    POLICY_VIEW_AUDIT_INFORMATION |
-    POLICY_GET_PRIVATE_INFORMATION)
+    STANDARD_RIGHTS_READ
+    | POLICY_VIEW_AUDIT_INFORMATION
+    | POLICY_GET_PRIVATE_INFORMATION
+)
 
 POLICY_WRITE = (
-    STANDARD_RIGHTS_WRITE |
-    POLICY_TRUST_ADMIN |
-    POLICY_CREATE_ACCOUNT |
-    POLICY_CREATE_SECRET |
-    POLICY_CREATE_PRIVILEGE |
-    POLICY_SET_DEFAULT_QUOTA_LIMITS |
-    POLICY_SET_AUDIT_REQUIREMENTS |
-    POLICY_AUDIT_LOG_ADMIN |
-    POLICY_SERVER_ADMIN)
+    STANDARD_RIGHTS_WRITE
+    | POLICY_TRUST_ADMIN
+    | POLICY_CREATE_ACCOUNT
+    | POLICY_CREATE_SECRET
+    | POLICY_CREATE_PRIVILEGE
+    | POLICY_SET_DEFAULT_QUOTA_LIMITS
+    | POLICY_SET_AUDIT_REQUIREMENTS
+    | POLICY_AUDIT_LOG_ADMIN
+    | POLICY_SERVER_ADMIN
+)
 
 POLICY_EXECUTE = (
-    STANDARD_RIGHTS_EXECUTE |
-    POLICY_VIEW_LOCAL_INFORMATION |
-    POLICY_LOOKUP_NAMES)
+    STANDARD_RIGHTS_EXECUTE
+    | POLICY_VIEW_LOCAL_INFORMATION
+    | POLICY_LOOKUP_NAMES
+)
 
 
 class TokenAccess:
@@ -268,8 +276,7 @@ class TokenInformationClass:
 class TOKEN_USER(ctypes.Structure):
     num = 1
     _fields_ = [
-        ('SID', ctypes.c_void_p),
-        ('ATTRIBUTES', ctypes.wintypes.DWORD),
+        ("SID", ctypes.c_void_p), ("ATTRIBUTES", ctypes.wintypes.DWORD)
     ]
 
 
@@ -290,13 +297,13 @@ class SECURITY_DESCRIPTOR(ctypes.Structure):
     REVISION = 1
 
     _fields_ = [
-        ('Revision', ctypes.c_ubyte),
-        ('Sbz1', ctypes.c_ubyte),
-        ('Control', SECURITY_DESCRIPTOR_CONTROL),
-        ('Owner', ctypes.c_void_p),
-        ('Group', ctypes.c_void_p),
-        ('Sacl', ctypes.c_void_p),
-        ('Dacl', ctypes.c_void_p),
+        ("Revision", ctypes.c_ubyte),
+        ("Sbz1", ctypes.c_ubyte),
+        ("Control", SECURITY_DESCRIPTOR_CONTROL),
+        ("Owner", ctypes.c_void_p),
+        ("Group", ctypes.c_void_p),
+        ("Sacl", ctypes.c_void_p),
+        ("Dacl", ctypes.c_void_p),
     ]
 
 
@@ -309,9 +316,9 @@ class SECURITY_ATTRIBUTES(ctypes.Structure):
     } SECURITY_ATTRIBUTES;
     """
     _fields_ = [
-        ('nLength', ctypes.wintypes.DWORD),
-        ('lpSecurityDescriptor', ctypes.c_void_p),
-        ('bInheritHandle', ctypes.wintypes.BOOL),
+        ("nLength", ctypes.wintypes.DWORD),
+        ("lpSecurityDescriptor", ctypes.c_void_p),
+        ("bInheritHandle", ctypes.wintypes.BOOL),
     ]
 
     def __init__(self, *args, **kwargs):
@@ -329,9 +336,7 @@ def descriptor(self, value):
 
 
 ctypes.windll.advapi32.SetSecurityDescriptorOwner.argtypes = (
-    ctypes.POINTER(SECURITY_DESCRIPTOR),
-    ctypes.c_void_p,
-    ctypes.wintypes.BOOL,
+    ctypes.POINTER(SECURITY_DESCRIPTOR), ctypes.c_void_p, ctypes.wintypes.BOOL
 )
 
 #########################
@@ -343,21 +348,30 @@ def GetTokenInformation(token, information_class):
     Given a token, get the token information for it.
     """
     data_size = ctypes.wintypes.DWORD()
-    ctypes.windll.advapi32.GetTokenInformation(token, information_class.num,
-        0, 0, ctypes.byref(data_size))
+    ctypes.windll.advapi32.GetTokenInformation(
+        token, information_class.num, 0, 0, ctypes.byref(data_size)
+    )
     data = ctypes.create_string_buffer(data_size.value)
-    handle_nonzero_success(ctypes.windll.advapi32.GetTokenInformation(token,
-        information_class.num,
-        ctypes.byref(data), ctypes.sizeof(data),
-        ctypes.byref(data_size)))
+    handle_nonzero_success(
+        ctypes.windll.advapi32.GetTokenInformation(
+            token,
+            information_class.num,
+            ctypes.byref(data),
+            ctypes.sizeof(data),
+            ctypes.byref(data_size),
+        )
+    )
     return ctypes.cast(data, ctypes.POINTER(TOKEN_USER)).contents
 
 
 def OpenProcessToken(proc_handle, access):
     result = ctypes.wintypes.HANDLE()
     proc_handle = ctypes.wintypes.HANDLE(proc_handle)
-    handle_nonzero_success(ctypes.windll.advapi32.OpenProcessToken(
-        proc_handle, access, ctypes.byref(result)))
+    handle_nonzero_success(
+        ctypes.windll.advapi32.OpenProcessToken(
+            proc_handle, access, ctypes.byref(result)
+        )
+    )
     return result
 
 
@@ -366,8 +380,7 @@ def get_current_user():
     Return a TOKEN_USER for the owner of this process.
     """
     process = OpenProcessToken(
-        ctypes.windll.kernel32.GetCurrentProcess(),
-        TokenAccess.TOKEN_QUERY,
+        ctypes.windll.kernel32.GetCurrentProcess(), TokenAccess.TOKEN_QUERY
     )
     return GetTokenInformation(process, TOKEN_USER)
 
@@ -389,8 +402,10 @@ def get_security_attributes_for_user(user=None):
     SA.descriptor = SD
     SA.bInheritHandle = 1
 
-    ctypes.windll.advapi32.InitializeSecurityDescriptor(ctypes.byref(SD),
-        SECURITY_DESCRIPTOR.REVISION)
-    ctypes.windll.advapi32.SetSecurityDescriptorOwner(ctypes.byref(SD),
-        user.SID, 0)
+    ctypes.windll.advapi32.InitializeSecurityDescriptor(
+        ctypes.byref(SD), SECURITY_DESCRIPTOR.REVISION
+    )
+    ctypes.windll.advapi32.SetSecurityDescriptorOwner(
+        ctypes.byref(SD), user.SID, 0
+    )
     return SA