Reformat code with black.

Author: Kami

contrib/generate_contributor_list.py

@@ -87,9 +87,7 @@ def parse_changes_file(file_path, versions=None):
                     active_tickets = active_tickets.split(", ")
                     active_tickets = [
                         ticket
-
                         for ticket in active_tickets
-
                         if ticket.startswith("LIBCLOUD-") or ticket.startswith("GITHUB-")
                     ]
 

libcloud/compute/drivers/equinixmetal.py

@@ -530,7 +530,6 @@ def _to_size(self, data):
             cpus = None
         regions = [
             region.get("href").replace("/metal/v1/locations/metros", "")
-
             for region in data.get("available_in_metros", [])
         ]
         extra = {
@@ -717,9 +716,7 @@ def ex_describe_all_addresses_for_project(
         ip_addresses = self.connection.request(path, params=params).object
         result = [
             a
-
             for a in ip_addresses.get("ip_addresses", [])
-
             if not only_associated or len(a.get("assignments", [])) > 0
         ]
 

libcloud/compute/drivers/gce.py

@@ -6447,7 +6447,6 @@ def ex_targetpool_add_node(self, targetpool, node):
 
         if all(
             (node_uri != n) and (not hasattr(n, "extra") or n.extra["selfLink"] != node_uri)
-
             for n in targetpool.nodes
         ):
             targetpool.nodes.append(node)
@@ -10565,7 +10564,6 @@ def _to_urlmap(self, urlmap):
         """
         extra = {
             k: urlmap.get(k)
-
             for k in ("creationTimestamp", "description", "fingerprint", "selfLink")
         }
 

libcloud/compute/drivers/nttcis.py

@@ -5579,7 +5579,6 @@ def _to_node(self, element):
             "networkId": findtext(element, "networkId", TYPES_URN),
             "networkDomainId": (
                 element.find(fixxpath("networkInfo", TYPES_URN)).get("networkDomainId")
-
                 if has_network_info
                 else None
             ),
@@ -5590,7 +5589,6 @@ def _to_node(self, element):
                     element.find(fixxpath("snapshotService/window", TYPES_URN)).get("dayOfWeek"),
                     element.find(fixxpath("snapshotService/window", TYPES_URN)).get("startHour"),
                 )
-
                 if has_snapshot
                 else None
             ),
@@ -5609,14 +5607,12 @@ def _to_node(self, element):
 
         private_ip = (
             element.find(fixxpath("networkInfo/primaryNic", TYPES_URN)).get("privateIpv4")
-
             if has_network_info
             else element.find(fixxpath("nic", TYPES_URN)).get("privateIpv4")
         )
 
         extra["ipv6"] = (
             element.find(fixxpath("networkInfo/primaryNic", TYPES_URN)).get("ipv6")
-
             if has_network_info
             else element.find(fixxpath("nic", TYPES_URN)).get("ipv6")
         )

libcloud/compute/drivers/vcloud.py

@@ -572,9 +572,7 @@ def vdcs(self):
             res = self.connection.request(self.org)
             self._vdcs = [
                 self._to_vdc(self.connection.request(get_url_path(i.get("href"))).object)
-
                 for i in res.object.findall(fixxpath(res.object, "Link"))
-
                 if i.get("type") == "application/vnd.vmware.vcloud.vdc+xml"
             ]
 
@@ -661,9 +659,7 @@ def _get_catalog_hrefs(self):
         res = self.connection.request(self.org)
         catalogs = [
             i.get("href")
-
             for i in res.object.findall(fixxpath(res.object, "Link"))
-
             if i.get("type") == "application/vnd.vmware.vcloud.catalog+xml"
         ]
 
@@ -756,9 +752,7 @@ def ex_list_nodes(self, vdcs=None):
             elms = res.object.findall(fixxpath(res.object, "ResourceEntities/ResourceEntity"))
             vapps = [
                 (i.get("name"), i.get("href"))
-
                 for i in elms
-
                 if i.get("type") == "application/vnd.vmware.vcloud.vApp+xml" and i.get("name")
             ]
 
@@ -810,9 +804,7 @@ def _get_catalogitems_hrefs(self, catalog):
         cat_items = res.findall(fixxpath(res, "CatalogItems/CatalogItem"))
         cat_item_hrefs = [
             i.get("href")
-
             for i in cat_items
-
             if i.get("type") == "application/vnd.vmware.vcloud.catalogItem+xml"
         ]
 
@@ -835,9 +827,7 @@ def list_images(self, location=None):
             res_ents = res.findall(fixxpath(res, "ResourceEntities/ResourceEntity"))
             images += [
                 self._to_image(i)
-
                 for i in res_ents
-
                 if i.get("type") == "application/vnd.vmware.vcloud.vAppTemplate+xml"
             ]
 
@@ -847,9 +837,7 @@ def list_images(self, location=None):
                 res_ents = res.findall(fixxpath(res, "Entity"))
                 images += [
                     self._to_image(i)
-
                     for i in res_ents
-
                     if i.get("type") == "application/vnd.vmware.vcloud.vAppTemplate+xml"
                 ]
 
@@ -1035,9 +1023,7 @@ def _get_auth_token(self):
             org_list_url = get_url_path(
                 next(
                     link
-
                     for link in body.findall(fixxpath(body, "Link"))
-
                     if link.get("type") == "application/vnd.vmware.vcloud.orgList+xml"
                 ).get("href")
             )
@@ -1053,9 +1039,7 @@ def _get_auth_token(self):
             self.driver.org = get_url_path(
                 next(
                     org
-
                     for org in body.findall(fixxpath(body, "Org"))
-
                     if org.get("name") == self.org_name
                 ).get("href")
             )
@@ -1489,7 +1473,9 @@ def ex_set_control_access(self, node, control_access):
 
                     if not res:
                         raise LibcloudError(
-                            'Specified subject "{} {}" not found '.format(subject.type, subject.name)
+                            'Specified subject "{} {}" not found '.format(
+                                subject.type, subject.name
+                            )
                         )
                     href = res[0]["href"]
                 ET.SubElement(setting, "Subject", {"href": href})
@@ -2513,9 +2499,7 @@ def _to_node(self, node_elm):
         # Find vDC
         vdc_id = next(
             link.get("href")
-
             for link in node_elm.findall(fixxpath(node_elm, "Link"))
-
             if link.get("type") == "application/vnd.vmware.vcloud.vdc+xml"
         )  # pylint: disable=no-member
         vdc = next(vdc for vdc in self.vdcs if vdc.id == vdc_id)

libcloud/compute/drivers/vsphere.py

@@ -168,7 +168,6 @@ def list_locations(self, ex_show_hosts_in_drs=True):
 
         potential_locations = [
             dc
-
             for dc in content.viewManager.CreateContainerView(
                 content.rootFolder,
                 [vim.ClusterComputeResource, vim.HostSystem],
@@ -755,7 +754,6 @@ def _to_node_recursive(self, virtual_machine):
                     "created": s.createTime.strftime("%Y-%m-%d %H:%M"),
                     "state": s.state,
                 }
-
                 for s in virtual_machine.snapshot.rootSnapshotList
             ]
             extra["snapshots"] = snapshots
@@ -1421,7 +1419,6 @@ async def _list_nodes_async(self, vm_ids, interfaces):
         loop = asyncio.get_event_loop()
         vms = [
             loop.run_in_executor(None, self._to_node, vm_ids[i], interfaces)
-
             for i in range(len(vm_ids))
         ]
 
@@ -1442,14 +1439,12 @@ async def _get_all_vms(self):
                 None,
                 functools.partial(self.ex_list_hosts, ex_filter_datacenters=datacenter["id"]),
             )
-
             for datacenter in datacenters
         ]
         hosts = await asyncio.gather(*hosts_futures)
 
         vm_resp_futures = [
             loop.run_in_executor(None, functools.partial(self._get_vms_with_host, host))
-
             for host in itertools.chain(*hosts)
         ]
 
@@ -1598,7 +1593,6 @@ def _list_interfaces(self):
                 "status": interface["status"],
                 "ip": interface["ipv4"]["address"],
             }
-
             for interface in response
         ]