Skip to content

Commit e5a5f1e

Browse files
committed
Fix style using new black version
1 parent 5c009bb commit e5a5f1e

47 files changed

Lines changed: 92 additions & 97 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

libcloud/common/abiquo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
1818
Common utilities needed by the :class:`AbiquoNodeDriver`.
1919
"""
20+
2021
import base64
2122

2223
from libcloud.utils.py3 import b, httplib, urlparse

libcloud/common/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class Connection:
327327
port = 443
328328
timeout = None # type: Optional[Union[int, float]]
329329
secure = 1
330-
driver = None # type: Type[BaseDriver]
330+
driver = None # type: Type[BaseDriver]
331331
action = None
332332
cache_busting = False
333333
backoff = None
@@ -410,7 +410,7 @@ def reset_context(self):
410410
def _tuple_from_url(self, url):
411411
secure = 1
412412
port = None
413-
(scheme, netloc, request_path, param, query, fragment) = urlparse.urlparse(url)
413+
scheme, netloc, request_path, param, query, fragment = urlparse.urlparse(url)
414414

415415
if scheme not in ["http", "https"]:
416416
raise LibcloudError("Invalid scheme: {} in url {}".format(scheme, url))
@@ -450,9 +450,9 @@ def connect(self, host=None, port=None, base_url=None, **kwargs):
450450
secure = self.secure
451451

452452
if getattr(self, "base_url", None) and base_url is None:
453-
(host, port, secure, request_path) = self._tuple_from_url(getattr(self, "base_url"))
453+
host, port, secure, request_path = self._tuple_from_url(getattr(self, "base_url"))
454454
elif base_url is not None:
455-
(host, port, secure, request_path) = self._tuple_from_url(base_url)
455+
host, port, secure, request_path = self._tuple_from_url(base_url)
456456
else:
457457
host = host or self.host
458458
port = port or self.port

libcloud/common/dimensiondata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"""
1616
Dimension Data Common Components
1717
"""
18+
1819
from time import sleep
1920
from base64 import b64encode
2021

libcloud/common/google.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
Please remember to secure your keys and access tokens.
6666
"""
6767

68-
6968
import os
7069
import sys
7170
import time
@@ -262,7 +261,7 @@ def parse_body(self):
262261
if json_error:
263262
raise JsonParseError(body, self.status, None)
264263
elif "error" in body:
265-
(code, message) = self._get_error(body)
264+
code, message = self._get_error(body)
266265
if code == "QUOTA_EXCEEDED":
267266
raise QuotaExceededError(message, self.status, code)
268267
elif code == "RESOURCE_ALREADY_EXISTS":
@@ -278,23 +277,23 @@ def parse_body(self):
278277

279278
elif self.status == httplib.NOT_FOUND:
280279
if (not json_error) and ("error" in body):
281-
(code, message) = self._get_error(body)
280+
code, message = self._get_error(body)
282281
else:
283282
message = body
284283
code = None
285284
raise ResourceNotFoundError(message, self.status, code)
286285

287286
elif self.status == httplib.BAD_REQUEST:
288287
if (not json_error) and ("error" in body):
289-
(code, message) = self._get_error(body)
288+
code, message = self._get_error(body)
290289
else:
291290
message = body
292291
code = None
293292
raise InvalidRequestError(message, self.status, code)
294293

295294
else:
296295
if (not json_error) and ("error" in body):
297-
(code, message) = self._get_error(body)
296+
code, message = self._get_error(body)
298297
else:
299298
message = body
300299
code = None

libcloud/common/openstack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ def morph_action_hook(self, action):
358358
def _set_up_connection_info(self, url):
359359
prev_conn = (self.host, self.port, self.secure)
360360
result = self._tuple_from_url(url)
361-
(self.host, self.port, self.secure, self.request_path) = result
361+
self.host, self.port, self.secure, self.request_path = result
362362
new_conn = (self.host, self.port, self.secure)
363363
if new_conn != prev_conn:
364364
# We only call connect in case connection details have changed - this way we correctly

libcloud/common/openstack_identity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ def authenticated_request(
758758
return response
759759

760760
def morph_action_hook(self, action):
761-
(_, _, _, request_path) = self._tuple_from_url(self.auth_url)
761+
_, _, _, request_path = self._tuple_from_url(self.auth_url)
762762

763763
if request_path == "":
764764
# No path is provided in the auth_url, use action passed to this

libcloud/compute/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
Provides base classes for working with drivers
1818
"""
1919

20-
2120
import os
2221
import re
2322
import time

libcloud/compute/deployment.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
Provides generic deployment steps for machines post boot.
1818
"""
1919

20-
2120
import os
2221
import re
2322
import binascii

libcloud/compute/drivers/azure_arm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,10 @@ def get_image(self, image_id, location=None):
439439
"""
440440

441441
if image_id.startswith("http"):
442-
(storageAccount, blobContainer, blob) = _split_blob_uri(image_id)
442+
storageAccount, blobContainer, blob = _split_blob_uri(image_id)
443443
return AzureVhdImage(storageAccount, blobContainer, blob, self)
444444
else:
445-
(ex_publisher, ex_offer, ex_sku, ex_version) = image_id.split(":")
445+
ex_publisher, ex_offer, ex_sku, ex_version = image_id.split(":")
446446
i = self.list_images(location, ex_publisher, ex_offer, ex_sku, ex_version)
447447
return i[0] if i else None
448448

@@ -2315,7 +2315,7 @@ def ex_run_command(
23152315

23162316
def _ex_delete_old_vhd(self, resource_group, uri):
23172317
try:
2318-
(storageAccount, blobContainer, blob) = _split_blob_uri(uri)
2318+
storageAccount, blobContainer, blob = _split_blob_uri(uri)
23192319
keys = self.ex_get_storage_account_keys(resource_group, storageAccount)
23202320
blobdriver = AzureBlobsStorageDriver(
23212321
storageAccount,

libcloud/compute/drivers/digitalocean.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"""
1616
DigitalOcean Driver
1717
"""
18+
1819
import json
1920
import warnings
2021

0 commit comments

Comments
 (0)