diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py b/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py index 8fc7c80e..c9099014 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py @@ -21,13 +21,13 @@ class CephManagerException(Exception): self.kwargs = kwargs if not message: try: - message = self.message % kwargs + message = self.message % kwargs # pylint: disable=W1645 except TypeError: LOG.warn(_LW('Exception in string format operation')) for name, value in kwargs.items(): LOG.error("%s: %s" % (name, value)) # at least get the core message out if something happened - message = self.message + message = self.message # pylint: disable=W1645 super(CephManagerException, self).__init__(message) diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py b/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py index 4fcb9886..31cb4ebe 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py @@ -386,7 +386,7 @@ class Monitor(HandleUpgradesMixin): return 0 else: try: - quota_gib = int(quota["output"]["quota_max_bytes"]) / (1024**3) + quota_gib = int(quota["output"]["quota_max_bytes"]) // (1024**3) return quota_gib except IOError: return 0 @@ -475,7 +475,7 @@ class Monitor(HandleUpgradesMixin): if (chassis_size == 0 or chassis_size > host['kb']): chassis_size = host['kb'] - tier_size += chassis_size / (1024**2) + tier_size += chassis_size // (1024**2) tier_sizes[tier['name']] = tier_size return tier_sizes diff --git a/ceph/python-cephclient/python-cephclient/cephclient/exception.py b/ceph/python-cephclient/python-cephclient/cephclient/exception.py index 03d2d027..58a13f28 100644 --- a/ceph/python-cephclient/python-cephclient/cephclient/exception.py +++ b/ceph/python-cephclient/python-cephclient/cephclient/exception.py @@ -11,10 +11,10 @@ class CephClientException(Exception): def __init__(self, *args, **kwargs): if "message" not in kwargs: try: - message = self.message.format(*args, **kwargs) + message = self.message.format(*args, **kwargs) # pylint: disable=W1645 except Exception: # noqa message = '{}, args:{}, kwargs: {}'.format( - self.message, args, kwargs) + self.message, args, kwargs) # pylint: disable=W1645 else: message = kwargs["message"] super(CephClientException, self).__init__(message) diff --git a/pylint.rc b/pylint.rc index 699db5d2..c14464d2 100755 --- a/pylint.rc +++ b/pylint.rc @@ -148,14 +148,10 @@ enable=E1603,E1609,E1610,E1602,E1606,E1608,E1607,E1605,E1604,E1601,E1611,W1652, # W1202: logging-format-interpolation # W1401: anomalous-backslash-in-string # W1618: no-absolute-import -# W1619: old-division -# W1636: map-builtin-not-iterating -# W1638: range-builtin-not-iterating -# W1645: exception-message-attribute disable=C,R,fixme, E0203,E0611,E1101,E1135,E1205, W0107,W0150,W0201,W0221,W0231,W0235,W0603,W0611,W0612,W0613,W0621,W0622, - W0702,W0703,W1201,W1202,W1401,W1618,W1619,W1636,W1638,W1645 + W0702,W0703,W1201,W1202,W1401,W1618 [REPORTS] # Set the output format. Available formats are text, parseable, colorized, msvs diff --git a/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/guest.py b/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/guest.py index 8345519b..46d6e3cf 100644 --- a/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/guest.py +++ b/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/guest.py @@ -32,7 +32,7 @@ def range_to_list(csv_range=None): """ if not csv_range: return [] - xranges = [(lambda L: range(L[0], L[-1] + 1))(map(int, r.split('-'))) + xranges = [(lambda L: list(range(L[0], L[-1] + 1)))(list(map(int, r.split('-')))) for r in csv_range.split(',')] return [y for x in xranges for y in x] diff --git a/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/instance.py b/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/instance.py index 1d9cc712..b633b958 100644 --- a/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/instance.py +++ b/utilities/pci-irq-affinity-agent/pci_irq_affinity/pci_irq_affinity/instance.py @@ -54,9 +54,9 @@ class instance: def update(self, domain): cells = set() for node_id in domain['nodelist']: - cell = numa_cell(node_id, range(domain['nr_vcpus']), domain['cpu_pinning']) + cell = numa_cell(node_id, list(range(domain['nr_vcpus'])), domain['cpu_pinning']) LOG.debug("cell_id=%s, vcpuset=%s, cpu_pinning=%s" - % (node_id, range(domain['nr_vcpus']), domain['cpu_pinning'])) + % (node_id, list(range(domain['nr_vcpus'])), domain['cpu_pinning'])) cells.update([cell]) self.numa_topology = numa_topology(self.uuid, cells)