[lint] Fix incorrect and inconsistent whitespace

Adjust whitespace to be consistent with the rest of the library.

discord/calls.py

@@ -153,4 +153,3 @@ class GroupCall:
         """
 
         return self._voice_states.get(user.id)
-

discord/channel.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/client.py

@@ -369,10 +369,8 @@ class Client:
                 await self.ws.poll_event()
             except ResumeWebSocket:
                 log.info('Got a request to RESUME the websocket.')
-                coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id,
+                coro = DiscordWebSocket.from_client(self, shard_id=self.shard_id, session=self.ws.session_id,
-                                                          session=self.ws.session_id,
+                                                    sequence=self.ws.sequence, resume=True)
-                                                          sequence=self.ws.sequence,
-                                                          resume=True)
                 self.ws = await asyncio.wait_for(coro, timeout=180.0, loop=self.loop)
 
     async def connect(self, *, reconnect=True):

discord/ext/commands/context.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/ext/commands/cooldowns.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/ext/commands/core.py

@@ -38,7 +38,7 @@ from . import converter as converters
 __all__ = ['Command', 'Group', 'GroupMixin', 'command', 'group',
            'has_role', 'has_permissions', 'has_any_role', 'check',
            'bot_has_role', 'bot_has_permissions', 'bot_has_any_role',
-            'cooldown', 'guild_only', 'is_owner', 'is_nsfw', ]
+           'cooldown', 'guild_only', 'is_owner', 'is_nsfw']
 
 def wrap_callback(coro):
     @functools.wraps(coro)

discord/ext/commands/errors.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/ext/commands/view.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/gateway.py

@@ -684,5 +684,3 @@ class DiscordVoiceWebSocket(websockets.client.WebSocketClientProtocol):
             self._keep_alive.stop()
 
         await super().close_connection(*args, **kwargs)
-
-

discord/http.py

@@ -339,8 +339,7 @@ class HTTPClient:
         return self.request(r, data=form)
 
     async def ack_message(self, channel_id, message_id):
-        r = Route('POST', '/channels/{channel_id}/messages/{message_id}/ack', channel_id=channel_id,
+        r = Route('POST', '/channels/{channel_id}/messages/{message_id}/ack', channel_id=channel_id, message_id=message_id)
-                                                                          message_id=message_id)
         data = await self.request(r, json={'token': self._ack_token})
         self._ack_token = data['token']
 
@@ -348,8 +347,7 @@ class HTTPClient:
         return self.request(Route('POST', '/guilds/{guild_id}/ack', guild_id=guild_id))
 
     def delete_message(self, channel_id, message_id, *, reason=None):
-        r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id,
+        r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, message_id=message_id)
-                                                                            message_id=message_id)
         return self.request(r, reason=reason)
 
     def delete_messages(self, channel_id, message_ids, *, reason=None):
@@ -361,8 +359,7 @@ class HTTPClient:
         return self.request(r, json=payload, reason=reason)
 
     def edit_message(self, message_id, channel_id, **fields):
-        r = Route('PATCH', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id,
+        r = Route('PATCH', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, message_id=message_id)
-                                                                           message_id=message_id)
         return self.request(r, json=fields)
 
     def add_reaction(self, message_id, channel_id, emoji):

discord/object.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 The MIT License (MIT)
 

discord/shard.py

@@ -76,10 +76,8 @@ class Shard:
             await self.ws.poll_event()
         except ResumeWebSocket:
             log.info('Got a request to RESUME the websocket at Shard ID %s.', self.id)
-            coro = DiscordWebSocket.from_client(self._client, resume=True,
+            coro = DiscordWebSocket.from_client(self._client, resume=True, shard_id=self.id,
-                                                              shard_id=self.id,
+                                                session=self.ws.session_id, sequence=self.ws.sequence)
-                                                              session=self.ws.session_id,
-                                                              sequence=self.ws.sequence)
             self.ws = await asyncio.wait_for(coro, timeout=180.0, loop=self.loop)
 
     def get_future(self):