diff options
author | Radostin Stoyanov <rstoyanov1@gmail.com> | 2017-10-11 12:35:55 +0100 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2018-01-27 15:30:17 -0500 |
commit | 6712261510953f9c729624dded29bfffd32f88e6 (patch) | |
tree | bec6eb540f2870c26fc49a38c73e097b5d3c3c3b | |
parent | e9b4d35dd05c554a49301318e41076f07538a800 (diff) | |
download | virt-manager-6712261510953f9c729624dded29bfffd32f88e6.tar.gz |
Python 2/3 division compatability
In Python 2 the classic devision of integers returns an integer
but in Python 3 it might return float.
Example:
- Python 2: - Python 3:
>>> 9 / 4 >>> 9 / 4
2 2.25
>>> 9 // 4 >>> 9 // 4
2 2
>>> 9 / 4.0 >>> 9 / 4.0
2.25 2.25
>>> 9 // 4.0 >>> 9 // 4.0
2.0 2.0
For more info see: https://www.python.org/dev/peps/pep-0238/
-rw-r--r-- | virtManager/console.py | 6 | ||||
-rw-r--r-- | virtManager/create.py | 6 | ||||
-rw-r--r-- | virtManager/createnet.py | 2 | ||||
-rw-r--r-- | virtManager/details.py | 4 | ||||
-rw-r--r-- | virtManager/domain.py | 10 | ||||
-rw-r--r-- | virtManager/fsdetails.py | 2 | ||||
-rw-r--r-- | virtManager/graphwidgets.py | 8 | ||||
-rw-r--r-- | virtManager/manager.py | 4 | ||||
-rw-r--r-- | virtManager/storagelist.py | 2 | ||||
-rw-r--r-- | virtinst/cpu.py | 10 | ||||
-rw-r--r-- | virtinst/devicedisk.py | 2 | ||||
-rw-r--r-- | virtinst/diskbackend.py | 2 | ||||
-rw-r--r-- | virtinst/progress.py | 12 | ||||
-rw-r--r-- | virtinst/storage.py | 8 |
14 files changed, 39 insertions, 39 deletions
diff --git a/virtManager/console.py b/virtManager/console.py index 47c7becb..a55084ef 100644 --- a/virtManager/console.py +++ b/virtManager/console.py @@ -402,12 +402,12 @@ class vmmConsolePages(vmmGObjectUI): if align_ratio > desktop_ratio: desktop_w = int(req.height * desktop_ratio) desktop_h = req.height - dx = (req.width - desktop_w) / 2 + dx = (req.width - desktop_w) // 2 else: desktop_w = req.width - desktop_h = int(req.width / desktop_ratio) - dy = (req.height - desktop_h) / 2 + desktop_h = int(req.width // desktop_ratio) + dy = (req.height - desktop_h) // 2 viewer_alloc = Gdk.Rectangle() viewer_alloc.x = dx diff --git a/virtManager/create.py b/virtManager/create.py index 88f0885a..d5d1d5a0 100644 --- a/virtManager/create.py +++ b/virtManager/create.py @@ -693,7 +693,7 @@ class vmmCreate(vmmGObjectUI): {'maxmem': _pretty_memory(memory)}) mem_label = ("<span size='small' color='#484848'>%s</span>" % mem_label) - self.widget("mem").set_range(50, memory / 1024) + self.widget("mem").set_range(50, memory // 1024) self.widget("phys-mem-label").set_markup(mem_label) # CPU @@ -2149,7 +2149,7 @@ class vmmCreate(vmmGObjectUI): # Change the default values suggested to the user. ram_size = DEFAULT_MEM if res and res.get("ram") > 0: - ram_size = res["ram"] / (1024 ** 2) + ram_size = res["ram"] // (1024 ** 2) self.widget("mem").set_value(ram_size) n_cpus = 1 @@ -2158,7 +2158,7 @@ class vmmCreate(vmmGObjectUI): self.widget("cpus").set_value(n_cpus) if res and res.get("storage"): - storage_size = int(res["storage"]) / (1024 ** 3) + storage_size = int(res["storage"]) // (1024 ** 3) self._addstorage.widget("storage-size").set_value(storage_size) # Validation passed, store the install path (if there is one) in diff --git a/virtManager/createnet.py b/virtManager/createnet.py index 3dfb3b63..9413d1e9 100644 --- a/virtManager/createnet.py +++ b/virtManager/createnet.py @@ -627,7 +627,7 @@ class vmmCreateNetwork(vmmGObjectUI): valid_ip = (ip.numhosts >= 8 and ip.is_private) gateway = (ip.prefixlen != 32 and str(ip.network + 1) or "") info = (ip.is_private and _("Private") or _("Other/Public")) - start = int(ip.numhosts / 2) + start = int(ip.numhosts // 2) end = int(ip.numhosts - 2) src.modify_bg(Gtk.StateType.NORMAL, valid_ip and _green or _red) diff --git a/virtManager/details.py b/virtManager/details.py index 23bb7423..ebe010b5 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -2584,7 +2584,7 @@ class vmmDetails(vmmGObjectUI): def refresh_config_memory(self): host_mem_widget = self.widget("state-host-memory") - host_mem = self.vm.conn.host_memory_size() / 1024 + host_mem = self.vm.conn.host_memory_size() // 1024 vm_cur_mem = self.vm.get_memory() / 1024.0 vm_max_mem = self.vm.maximum_memory() / 1024.0 @@ -2965,7 +2965,7 @@ class vmmDetails(vmmGObjectUI): ram = vid.vram heads = vid.heads try: - ramlabel = ram and "%d MiB" % (int(ram) / 1024) or "-" + ramlabel = ram and "%d MiB" % (int(ram) // 1024) or "-" except Exception: ramlabel = "-" diff --git a/virtManager/domain.py b/virtManager/domain.py index 1134a43a..ed94cf16 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -1984,7 +1984,7 @@ class vmmDomain(vmmLibvirtObject): except libvirt.libvirtError as err: logging.error("Error reading mem stats: %s", err) - pcentCurrMem = (curmem / float(totalmem)) * 100 + pcentCurrMem = (curmem // float(totalmem)) * 100 pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0)) return pcentCurrMem, curmem @@ -2033,10 +2033,10 @@ class vmmDomain(vmmLibvirtObject): "cpuGuestPercent": pcentGuestCpu, "curmem": curmem, "currMemPercent": pcentCurrMem, - "diskRdKiB": rdBytes / 1024, - "diskWrKiB": wrBytes / 1024, - "netRxKiB": rxBytes / 1024, - "netTxKiB": txBytes / 1024, + "diskRdKiB": rdBytes // 1024, + "diskWrKiB": wrBytes // 1024, + "netRxKiB": rxBytes // 1024, + "netTxKiB": txBytes // 1024, } for r in ["diskRd", "diskWr", "netRx", "netTx"]: diff --git a/virtManager/fsdetails.py b/virtManager/fsdetails.py index 59593425..dda21fc5 100644 --- a/virtManager/fsdetails.py +++ b/virtManager/fsdetails.py @@ -190,7 +190,7 @@ class vmmFSDetails(vmmGObjectUI): if dev.type != VirtualFilesystem.TYPE_RAM: self.widget("fs-source").set_text(dev.source) else: - self.widget("fs-ram-source-spin").set_value(int(dev.source) / 1024) + self.widget("fs-ram-source-spin").set_value(int(dev.source) // 1024) self.widget("fs-target").set_text(dev.target or "") self.widget("fs-readonly").set_active(dev.readonly) diff --git a/virtManager/graphwidgets.py b/virtManager/graphwidgets.py index 84480b78..4a0b3ec8 100644 --- a/virtManager/graphwidgets.py +++ b/virtManager/graphwidgets.py @@ -150,7 +150,7 @@ class CellRendererSparkline(Gtk.CellRenderer): graph_width = (cell_area.width - (GRAPH_PAD * 2)) graph_height = (cell_area.height - (GRAPH_PAD * 2)) - pixels_per_point = (graph_width / max(1, len(self.data_array) - 1)) + pixels_per_point = (graph_width // max(1, len(self.data_array) - 1)) # Graph width needs to be some multiple of the amount of data points # we have @@ -316,7 +316,7 @@ class Sparkline(Gtk.DrawingArea): w = window.get_width() h = window.get_height() - points_per_set = (len(self.data_array) / self.num_sets) + points_per_set = (len(self.data_array) // self.num_sets) pixels_per_point = (float(w) / (float((points_per_set - 1) or 1))) @@ -330,9 +330,9 @@ class Sparkline(Gtk.DrawingArea): max_ticks = 4 for index in range(1, max_ticks): Gtk.render_line(ctx, cr, 1, - (h / max_ticks) * index, + (h // max_ticks) * index, w - 2, - (h / max_ticks) * index) + (h // max_ticks) * index) # Foreground-color graphics context # This draws the black border diff --git a/virtManager/manager.py b/virtManager/manager.py index d38fc4e4..d6640fbc 100644 --- a/virtManager/manager.py +++ b/virtManager/manager.py @@ -1068,7 +1068,7 @@ class vmmManager(vmmGObjectUI): return d1, d2 = obj.disk_io_vectors(GRAPH_LEN, self.max_disk_rate) - data = [(x + y) / 2 for x, y in zip(d1, d2)] + data = [(x + y) // 2 for x, y in zip(d1, d2)] cell.set_property('data_array', data) def network_traffic_img(self, column_ignore, cell, model, _iter, data): @@ -1077,5 +1077,5 @@ class vmmManager(vmmGObjectUI): return d1, d2 = obj.network_traffic_vectors(GRAPH_LEN, self.max_net_rate) - data = [(x + y) / 2 for x, y in zip(d1, d2)] + data = [(x + y) // 2 for x, y in zip(d1, d2)] cell.set_property('data_array', data) diff --git a/virtManager/storagelist.py b/virtManager/storagelist.py index 3764b2c6..8f633c42 100644 --- a/virtManager/storagelist.py +++ b/virtManager/storagelist.py @@ -415,7 +415,7 @@ class vmmStorageList(vmmGObjectUI): model.clear() vadj = self.widget("vol-scroll").get_vadjustment() - vscroll_percent = vadj.get_value() / max(vadj.get_upper(), 1) + vscroll_percent = vadj.get_value() // max(vadj.get_upper(), 1) for vol in vols: key = vol.get_connkey() diff --git a/virtinst/cpu.py b/virtinst/cpu.py index 3925106c..049f8cfb 100644 --- a/virtinst/cpu.py +++ b/virtinst/cpu.py @@ -175,18 +175,18 @@ class CPU(XMLBuilder): vcpus = int(vcpus or 0) if not self.sockets: if not self.cores: - self.sockets = vcpus / self.threads + self.sockets = vcpus // self.threads else: - self.sockets = vcpus / self.cores + self.sockets = vcpus // self.cores if not self.cores: if not self.threads: - self.cores = vcpus / self.sockets + self.cores = vcpus // self.sockets else: - self.cores = vcpus / (self.sockets * self.threads) + self.cores = vcpus // (self.sockets * self.threads) if not self.threads: - self.threads = vcpus / (self.sockets * self.cores) + self.threads = vcpus // (self.sockets * self.cores) return diff --git a/virtinst/devicedisk.py b/virtinst/devicedisk.py index 73ccb5de..9f56398e 100644 --- a/virtinst/devicedisk.py +++ b/virtinst/devicedisk.py @@ -430,7 +430,7 @@ class VirtualDisk(VirtualDevice): """ digits = [] for factor in range(0, 3): - amt = (num % (26 ** (factor + 1))) / (26 ** factor) + amt = (num % (26 ** (factor + 1))) // (26 ** factor) if amt == 0 and num >= (26 ** (factor + 1)): amt = 26 num -= amt diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py index 636aa51f..a11b413a 100644 --- a/virtinst/diskbackend.py +++ b/virtinst/diskbackend.py @@ -404,7 +404,7 @@ class CloneStorageCreator(_StorageCreator): if msg: msg += (_(" %d M requested > %d M available") % - ((need / (1024 * 1024)), (avail / (1024 * 1024)))) + ((need // (1024 * 1024)), (avail // (1024 * 1024)))) return (ret, msg) def create(self, progresscb): diff --git a/virtinst/progress.py b/virtinst/progress.py index 2b070540..1cab0e8c 100644 --- a/virtinst/progress.py +++ b/virtinst/progress.py @@ -79,7 +79,7 @@ class TerminalLine: a number of different elements (default=2). """ if self._llen < fixed: return 0 - return (self._llen - fixed) / elements + return (self._llen - fixed) // elements def add(self, element, full_len=None): """ If there is room left in the line, above min_len, add element. @@ -249,7 +249,7 @@ class TextMeter(BaseMeter): sofar_size = None if _text_meter_total_size: sofar_size = _text_meter_sofar_size + amount_read - sofar_pc = (sofar_size * 100) / _text_meter_total_size + sofar_pc = (sofar_size * 100) // _text_meter_total_size # Include text + ui_rate in minimal tl = TerminalLine(8, 8+1+8) @@ -385,7 +385,7 @@ class RateEstimator: (can be None for unknown transfer size)""" if self.total is None: return None elif self.total == 0: return 1.0 - else: return float(self.last_amount_read)/self.total + else: return float(self.last_amount_read) / self.total ######################################################################### # support methods @@ -432,7 +432,7 @@ class RateEstimator: """ if rt < 0: return 0.0 - shift = int(math.log(rt/start_time)/math.log(2)) + shift = int(math.log(rt / start_time) / math.log(2)) rt = int(rt) if shift <= 0: return rt return float(int(rt) >> shift << shift) @@ -446,10 +446,10 @@ def format_time(seconds, use_hours=0): return 'Infinite' else: seconds = int(seconds) - minutes = seconds / 60 + minutes = seconds // 60 seconds = seconds % 60 if use_hours: - hours = minutes / 60 + hours = minutes // 60 minutes = minutes % 60 return '%02i:%02i:%02i' % (hours, minutes, seconds) else: diff --git a/virtinst/storage.py b/virtinst/storage.py index babec2f3..379bdd7f 100644 --- a/virtinst/storage.py +++ b/virtinst/storage.py @@ -892,13 +892,13 @@ class StorageVolume(_StorageObject): return (True, _("There is not enough free space on the storage " "pool to create the volume. " "(%d M requested allocation > %d M available)") % - ((self.allocation / (1024 * 1024)), - (avail / (1024 * 1024)))) + ((self.allocation // (1024 * 1024)), + (avail // (1024 * 1024)))) elif self.capacity > avail: return (False, _("The requested volume capacity will exceed the " "available pool space when the volume is fully " "allocated. " "(%d M requested capacity > %d M available)") % - ((self.capacity / (1024 * 1024)), - (avail / (1024 * 1024)))) + ((self.capacity // (1024 * 1024)), + (avail // (1024 * 1024)))) return (False, "") |