From 3aa941571afe77f772f835b3ab6cc0f85afe1cce Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 17 May 2016 17:27:23 -0400 Subject: [PATCH] uiutil: Drop check for old pygobject row handling Once upon a time it couldn't handle setting a row value to None, but we've bumped the dep now --- virtManager/manager.py | 4 ---- virtManager/snapshots.py | 3 --- virtManager/uiutil.py | 7 ------- 3 files changed, 14 deletions(-) diff --git a/virtManager/manager.py b/virtManager/manager.py index 96c0292c..765b3a12 100644 --- a/virtManager/manager.py +++ b/virtManager/manager.py @@ -754,8 +754,6 @@ class vmmManager(vmmGObjectUI): row[ROW_MARKUP] = self._build_vm_markup(name, status) desc = vm.get_description() - if not uiutil.can_set_row_none: - desc = desc or "" row[ROW_HINT] = util.xml_escape(desc) except libvirt.libvirtError, e: if util.exception_is_libvirt_error(e, "VIR_ERR_NO_DOMAIN"): @@ -770,8 +768,6 @@ class vmmManager(vmmGObjectUI): return new_icon = _get_inspection_icon_pixbuf(vm, 16, 16) - if not uiutil.can_set_row_none: - new_icon = new_icon or "" row[ROW_INSPECTION_OS_ICON] = new_icon self.vm_row_updated(vm) diff --git a/virtManager/snapshots.py b/virtManager/snapshots.py index 4083009c..825ee599 100644 --- a/virtManager/snapshots.py +++ b/virtManager/snapshots.py @@ -231,9 +231,6 @@ class vmmSnapshotPage(vmmGObjectUI): has_internal = False for snap in snapshots: desc = snap.get_xmlobj().description - if not uiutil.can_set_row_none: - desc = desc or "" - name = snap.get_name() state = util.xml_escape(snap.run_status()) if snap.is_external(): diff --git a/virtManager/uiutil.py b/virtManager/uiutil.py index 35d8293b..ccab662b 100644 --- a/virtManager/uiutil.py +++ b/virtManager/uiutil.py @@ -21,13 +21,6 @@ from gi.repository import GObject from gi.repository import Gtk -try: - import gi - gi.check_version("3.7.4") - can_set_row_none = True -except (ValueError, AttributeError): - can_set_row_none = False - ##################### # UI getter helpers #