Fix more bugs detected by the new version of pylint.

Author: Kami

contrib/generate_contributor_list.py

@@ -87,7 +87,9 @@ 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-")
                     ]
 
@@ -111,12 +113,14 @@ def convert_to_markdown(contributors_map, include_tickets=False):
     def compare(item1, item2):
         lastname1 = item1.split(" ")[-1].lower()
         lastname2 = item2.split(" ")[-1].lower()
+
         return (lastname1 > lastname2) - (lastname1 < lastname2)
 
     names = contributors_map.keys()
     names = sorted(names, cmp=compare)
 
     result = []
+
     for name in names:
         tickets = contributors_map[name]
 
@@ -125,6 +129,7 @@ def compare(item1, item2):
         for ticket in tickets:
             if "-" not in ticket:
                 # Invalid ticket number
+
                 continue
 
             number = ticket.split("-")[1]
@@ -133,6 +138,8 @@ def compare(item1, item2):
                 url = JIRA_URL % (number)
             elif ticket.startswith("GITHUB-") or ticket.startswith("GH-"):
                 url = GITHUB_URL % (number)
+            else:
+                url = None
 
             values = {"ticket": ticket, "url": url}
             tickets_string.append("[%(ticket)s](%(url)s)" % values)
@@ -147,6 +154,7 @@ def compare(item1, item2):
         result.append(line.strip())
 
     result = "\n".join(result)
+
     return result
 
 

libcloud/dns/drivers/google.py

@@ -78,6 +78,7 @@ def __init__(self, user_id, key, project=None, auth_type=None, scopes=None, **kw
         self.auth_type = auth_type
         self.project = project
         self.scopes = scopes
+
         if not self.project:
             raise ValueError("Project name must be specified using " '"project" keyword.')
         super().__init__(user_id, key, **kwargs)
@@ -88,6 +89,7 @@ def iterate_zones(self):
 
         :rtype: ``generator`` of :class:`Zone`
         """
+
         return self._get_more("zones")
 
     def iterate_records(self, zone):
@@ -99,6 +101,7 @@ def iterate_records(self, zone):
 
         :rtype: ``generator`` of :class:`Record`
         """
+
         return self._get_more("records", zone=zone)
 
     def get_zone(self, zone_id):
@@ -147,6 +150,7 @@ def get_record(self, zone_id, record_id):
 
         if len(response["rrsets"]) > 0:
             zone = self.get_zone(zone_id)
+
             return self._to_record(response["rrsets"][0], zone)
 
         raise RecordDoesNotExistError(value="", driver=self.connection.driver, record_id=record_id)
@@ -188,6 +192,7 @@ def create_zone(self, domain, type="master", ttl=None, extra=None):
 
         request = "/managedZones"
         response = self.connection.request(request, method="POST", data=data).object
+
         return self._to_zone(response)
 
     def create_record(self, name, zone, type, data, extra=None):
@@ -217,6 +222,7 @@ def create_record(self, name, zone, type, data, extra=None):
         data = {"additions": [{"name": name, "type": type, "ttl": int(ttl), "rrdatas": rrdatas}]}
         request = "/managedZones/%s/changes" % (zone.id)
         response = self.connection.request(request, method="POST", data=data).object
+
         return self._to_record(response["additions"][0], zone)
 
     def delete_zone(self, zone):
@@ -232,6 +238,7 @@ def delete_zone(self, zone):
         """
         request = "/managedZones/%s" % (zone.id)
         response = self.connection.request(request, method="DELETE")
+
         return response.success()
 
     def delete_record(self, record):
@@ -255,6 +262,7 @@ def delete_record(self, record):
         }
         request = "/managedZones/%s/changes" % (record.zone.id)
         response = self.connection.request(request, method="POST", data=data)
+
         return response.success()
 
     def ex_bulk_record_changes(self, zone, records):
@@ -296,6 +304,7 @@ def ex_bulk_record_changes(self, zone, records):
     def _get_more(self, rtype, **kwargs):
         last_key = None
         exhausted = False
+
         while not exhausted:
             items, last_key, exhausted = self._get_data(rtype, last_key, **kwargs)
             yield from items
@@ -315,6 +324,8 @@ def _get_data(self, rtype, last_key, **kwargs):
             request = "/managedZones/%s/rrsets" % (zone.id)
             transform_func = self._to_records
             r_key = "rrsets"
+        else:
+            raise ValueError(f"Unsupported rtype: {rtype}")
 
         response = self.connection.request(
             request,
@@ -326,6 +337,7 @@ def _get_data(self, rtype, last_key, **kwargs):
             nextpage = response.object.get("nextPageToken", None)
             items = transform_func(response.object.get(r_key), **kwargs)
             exhausted = False if nextpage is not None else True
+
             return items, nextpage, exhausted
         else:
             return [], None, True
@@ -339,8 +351,10 @@ def _ex_connection_class_kwargs(self):
 
     def _to_zones(self, response):
         zones = []
+
         for r in response:
             zones.append(self._to_zone(r))
+
         return zones
 
     def _to_zone(self, r):
@@ -364,12 +378,15 @@ def _to_zone(self, r):
 
     def _to_records(self, response, zone):
         records = []
+
         for r in response:
             records.append(self._to_record(r, zone))
+
         return records
 
     def _to_record(self, r, zone):
         record_id = "{}:{}".format(r["type"], r["name"])
+
         return Record(
             id=record_id,
             name=r["name"],
@@ -384,6 +401,8 @@ def _to_record(self, r, zone):
     def _cleanup_domain(self, domain):
         # name can only contain lower case alphanumeric characters and hyphens
         domain = re.sub(r"[^a-zA-Z0-9-]", "-", domain)
+
         if domain[-1] == "-":
             domain = domain[:-1]
+
         return domain

libcloud/dns/drivers/onapp.py

@@ -53,6 +53,7 @@ def list_zones(self):
         response = self.connection.request("/dns_zones.json")
 
         zones = self._to_zones(response.object)
+
         return zones
 
     def get_zone(self, zone_id):
@@ -66,6 +67,7 @@ def get_zone(self, zone_id):
         """
         response = self.connection.request("/dns_zones/%s.json" % zone_id)
         zone = self._to_zone(response.object)
+
         return zone
 
     def create_zone(self, domain, type="master", ttl=None, extra=None):
@@ -91,6 +93,7 @@ def create_zone(self, domain, type="master", ttl=None, extra=None):
         https://docs.onapp.com/display/52API/Add+DNS+Zone
         """
         dns_zone = {"name": domain}
+
         if extra is not None:
             dns_zone.update(extra)
         dns_zone_data = json.dumps({"dns_zone": dns_zone})
@@ -101,6 +104,7 @@ def create_zone(self, domain, type="master", ttl=None, extra=None):
             data=dns_zone_data,
         )
         zone = self._to_zone(response.object)
+
         return zone
 
     def delete_zone(self, zone):
@@ -115,6 +119,7 @@ def delete_zone(self, zone):
         :rtype: ``bool``
         """
         self.connection.request("/dns_zones/%s.json" % zone.id, method="DELETE")
+
         return True
 
     def list_records(self, zone):
@@ -129,6 +134,7 @@ def list_records(self, zone):
         response = self.connection.request("/dns_zones/%s/records.json" % zone.id)
         dns_records = response.object["dns_zone"]["records"]
         records = self._to_records(dns_records, zone)
+
         return records
 
     def get_record(self, zone_id, record_id):
@@ -147,6 +153,7 @@ def get_record(self, zone_id, record_id):
             "/dns_zones/{}/records/{}.json".format(zone_id, record_id)
         )
         record = self._to_record(response.object, zone_id=zone_id)
+
         return record
 
     def create_record(self, name, zone, type, data, extra=None):
@@ -186,6 +193,7 @@ def create_record(self, name, zone, type, data, extra=None):
             data=dns_record_data,
         )
         record = self._to_record(response.object, zone=zone)
+
         return record
 
     def update_record(self, record, name, type, data, extra=None):
@@ -226,6 +234,7 @@ def update_record(self, record, name, type, data, extra=None):
             data=dns_record_data,
         )
         record = self.get_record(zone.id, record.id)
+
         return record
 
     def delete_record(self, record):
@@ -244,6 +253,7 @@ def delete_record(self, record):
         self.connection.request(
             "/dns_zones/{}/records/{}.json".format(zone_id, record.id), method="DELETE"
         )
+
         return True
 
     #
@@ -253,6 +263,7 @@ def delete_record(self, record):
     def _format_record(self, name, type, data, extra):
         if name == "":
             name = "@"
+
         if extra is None:
             extra = {}
         record_type = self.RECORD_TYPE_MAP[type]
@@ -261,6 +272,7 @@ def _format_record(self, name, type, data, extra):
             "ttl": extra.get("ttl", DEFAULT_ZONE_TTL),
             "type": record_type,
         }
+
         if type == RecordType.MX:
             additions = {
                 "priority": extra.get("priority", 1),
@@ -283,12 +295,16 @@ def _format_record(self, name, type, data, extra):
             additions = {"txt": extra.get("txt")}
         elif type == RecordType.NS:
             additions = {"hostname": extra.get("hostname")}
+        else:
+            additions = {}
 
         new_record.update(additions)
+
         return new_record
 
     def _to_zones(self, data):
         zones = []
+
         for zone in data:
             _zone = self._to_zone(zone)
             zones.append(_zone)
@@ -320,11 +336,13 @@ def _to_zone(self, data):
     def _to_records(self, data, zone):
         records = []
         data = data.values()
+
         for data_type in data:
             for item in data_type:
                 record = self._to_record(item, zone=zone)
                 records.append(record)
         records.sort(key=lambda x: x.id, reverse=False)
+
         return records
 
     def _to_record(self, data, zone_id=None, zone=None):
@@ -335,6 +353,7 @@ def _to_record(self, data, zone_id=None, zone=None):
         name = record.get("name")
         type = record.get("type")
         ttl = record.get("ttl", None)
+
         return Record(
             id=id,
             name=name,