override: Convert to list comprehension

:%s/retlist = list()\n\s*\(for \w\+ in ret\):\n\s*retlist.append(\(.*\))\n\n\s*return retlist/return [\2 \1]/

Signed-off-by: Philipp Hahn <hahn@univention.de>

6 files changed, 16 insertions, 82 deletions

diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py
index 255522c..0526620 100644
--- a/libvirt-override-virConnect.py
+++ b/libvirt-override-virConnect.py
@@ -467,11 +467,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllDomains() failed")
 
-        retlist = list()
-        for domptr in ret:
-            retlist.append(virDomain(self, _obj=domptr))
-
-        return retlist
+        return [virDomain(self, _obj=domptr) for domptr in ret]
 
     def listAllStoragePools(self, flags: int = 0) -> List['virStoragePool']:
         """Returns a list of storage pool objects"""
@@ -479,11 +475,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllStoragePools() failed")
 
-        retlist = list()
-        for poolptr in ret:
-            retlist.append(virStoragePool(self, _obj=poolptr))
-
-        return retlist
+        return [virStoragePool(self, _obj=poolptr) for poolptr in ret]
 
     def listAllNetworks(self, flags: int = 0) -> List['virNetwork']:
         """Returns a list of network objects"""
@@ -491,11 +483,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllNetworks() failed")
 
-        retlist = list()
-        for netptr in ret:
-            retlist.append(virNetwork(self, _obj=netptr))
-
-        return retlist
+        return [virNetwork(self, _obj=netptr) for netptr in ret]
 
     def listAllInterfaces(self, flags: int = 0) -> List['virInterface']:
         """Returns a list of interface objects"""
@@ -503,11 +491,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllInterfaces() failed")
 
-        retlist = list()
-        for ifaceptr in ret:
-            retlist.append(virInterface(self, _obj=ifaceptr))
-
-        return retlist
+        return [virInterface(self, _obj=ifaceptr) for ifaceptr in ret]
 
     def listAllDevices(self, flags: int = 0) -> List['virNodeDevice']:
         """Returns a list of host node device objects"""
@@ -515,11 +499,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllNodeDevices() failed")
 
-        retlist = list()
-        for devptr in ret:
-            retlist.append(virNodeDevice(self, _obj=devptr))
-
-        return retlist
+        return [virNodeDevice(self, _obj=devptr) for devptr in ret]
 
     def listAllNWFilters(self, flags: int = 0) -> List['virNWFilter']:
         """Returns a list of network filter objects"""
@@ -527,11 +507,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllNWFilters() failed")
 
-        retlist = list()
-        for filter_ptr in ret:
-            retlist.append(virNWFilter(self, _obj=filter_ptr))
-
-        return retlist
+        return [virNWFilter(self, _obj=filter_ptr) for filter_ptr in ret]
 
     def listAllNWFilterBindings(self, flags: int = 0) -> List['virNWFilterBinding']:
         """Returns a list of network filter binding objects"""
@@ -539,11 +515,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllNWFilterBindings() failed")
 
-        retlist = list()
-        for filter_ptr in ret:
-            retlist.append(virNWFilterBinding(self, _obj=filter_ptr))
-
-        return retlist
+        return [virNWFilterBinding(self, _obj=filter_ptr) for filter_ptr in ret]
 
     def listAllSecrets(self, flags: int = 0) -> List['virSecret']:
         """Returns a list of secret objects"""
@@ -551,11 +523,7 @@
         if ret is None:
             raise libvirtError("virConnectListAllSecrets() failed")
 
-        retlist = list()
-        for secret_ptr in ret:
-            retlist.append(virSecret(self, _obj=secret_ptr))
-
-        return retlist
+        return [virSecret(self, _obj=secret_ptr) for secret_ptr in ret]
 
     def _dispatchCloseCallback(self, reason: int, cbData: Dict[str, Any]) -> int:
         """Dispatches events to python user close callback"""
@@ -657,12 +625,7 @@
         if ret is None:
             raise libvirtError("virConnectGetAllDomainStats() failed")
 
-        retlist = list()
-        for elem in ret:
-            record = (virDomain(self, _obj=elem[0]), elem[1])
-            retlist.append(record)
-
-        return retlist
+        return [(virDomain(self, _obj=elem[0]), elem[1]) for elem in ret]
 
     def domainListGetStats(self, doms: List['virDomain'], stats: int = 0, flags: int = 0) -> List[Tuple['virDomain', Dict[str, Any]]]:
         """ Query statistics for given domains.
@@ -704,9 +667,4 @@
         if ret is None:
             raise libvirtError("virDomainListGetStats() failed")
 
-        retlist = list()
-        for elem in ret:
-            record = (virDomain(self, _obj=elem[0]), elem[1])
-            retlist.append(record)
-
-        return retlist
+        return [(virDomain(self, _obj=elem[0]), elem[1]) for elem in ret]
diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py
index aa86a00..9427cb2 100644
--- a/libvirt-override-virDomain.py
+++ b/libvirt-override-virDomain.py
@@ -4,11 +4,7 @@
         if ret is None:
             raise libvirtError("virDomainListAllSnapshots() failed")
 
-        retlist = list()
-        for snapptr in ret:
-            retlist.append(virDomainSnapshot(self, _obj=snapptr))
-
-        return retlist
+        return [virDomainSnapshot(self, _obj=snapptr) for snapptr in ret]
 
     def listAllCheckpoints(self, flags: int = 0) -> List['virDomainCheckpoint']:
         """List all checkpoints and returns a list of checkpoint objects"""
@@ -16,11 +12,7 @@
         if ret is None:
             raise libvirtError("virDomainListAllCheckpoints() failed")
 
-        retlist = list()
-        for chkptr in ret:
-            retlist.append(virDomainCheckpoint(self, _obj=chkptr))
-
-        return retlist
+        return [virDomainCheckpoint(self, _obj=chkptr) for chkptr in ret]
 
     def createWithFiles(self, files: List[int], flags: int = 0) -> 'virDomain':
         """Launch a defined domain. If the call succeeds the domain moves from the
diff --git a/libvirt-override-virDomainCheckpoint.py b/libvirt-override-virDomainCheckpoint.py
index 8b9d212..a8ba643 100644
--- a/libvirt-override-virDomainCheckpoint.py
+++ b/libvirt-override-virDomainCheckpoint.py
@@ -12,8 +12,4 @@
         if ret is None:
             raise libvirtError("virDomainCheckpointListAllChildren() failed")
 
-        retlist = list()
-        for chkptr in ret:
-            retlist.append(virDomainCheckpoint(self.domain(), _obj=chkptr))
-
-        return retlist
+        return [virDomainCheckpoint(self.domain(), _obj=chkptr) for chkptr in ret]
diff --git a/libvirt-override-virDomainSnapshot.py b/libvirt-override-virDomainSnapshot.py
index 64bd319..ca12fe4 100644
--- a/libvirt-override-virDomainSnapshot.py
+++ b/libvirt-override-virDomainSnapshot.py
@@ -12,8 +12,4 @@
         if ret is None:
             raise libvirtError("virDomainSnapshotListAllChildren() failed")
 
-        retlist = list()
-        for snapptr in ret:
-            retlist.append(virDomainSnapshot(self.domain(), _obj=snapptr))
-
-        return retlist
+        return [virDomainSnapshot(self.domain(), _obj=snapptr) for snapptr in ret]
diff --git a/libvirt-override-virNetwork.py b/libvirt-override-virNetwork.py
index 892f8e4..9714af4 100644
--- a/libvirt-override-virNetwork.py
+++ b/libvirt-override-virNetwork.py
@@ -4,8 +4,4 @@
         if ret is None:
             raise libvirtError("virNetworkListAllPorts() failed")
 
-        retlist = list()
-        for domptr in ret:
-            retlist.append(virNetworkPort(self, _obj=domptr))
-
-        return retlist
+        return [virNetworkPort(self, _obj=domptr) for domptr in ret]
diff --git a/libvirt-override-virStoragePool.py b/libvirt-override-virStoragePool.py
index 669df3e..d631cd2 100644
--- a/libvirt-override-virStoragePool.py
+++ b/libvirt-override-virStoragePool.py
@@ -4,8 +4,4 @@
         if ret is None:
             raise libvirtError("virStoragePoolListAllVolumes() failed")
 
-        retlist = list()
-        for volptr in ret:
-            retlist.append(virStorageVol(self._conn, _obj=volptr))
-
-        return retlist
+        return [virStorageVol(self._conn, _obj=volptr) for volptr in ret]