diff --git a/pym/install/distr.py b/pym/install/distr.py index ce3f7a6..ba8e36b 100644 --- a/pym/install/distr.py +++ b/pym/install/distr.py @@ -1100,11 +1100,11 @@ class PartitionDistributive(Distributive): def getMultipartData(self): """Get multipartition data""" - mulipartData = zip(self.multipartition.getPartitions(), + mulipartData = list(zip(self.multipartition.getPartitions(), self.multipartition.getMountPoints(), self.multipartition.getFileSystems(), self.multipartition.getIsFormat(), - self.multipartition.getPartitionTable()) + self.multipartition.getPartitionTable())) return mulipartData def convertToDirectory(self): diff --git a/pym/install/install.py b/pym/install/install.py index d99efb3..9ce2834 100644 --- a/pym/install/install.py +++ b/pym/install/install.py @@ -405,7 +405,7 @@ class Install(MethodsInterface): labels = ["calculate%d" % i for i in range(1, len(efidirs) + 1)] else: labels = ["calculate"] - for efiname, efidir in reversed(zip(labels, efidirs)): + for efiname, efidir in reversed(list(zip(labels, efidirs))): self._install_grub_uefi(cmd_grub_install, prefix_boot, target, efidir, efiname) # удаляем устаревшие diff --git a/pym/install/variables/net.py b/pym/install/variables/net.py index 70e3747..ae70cde 100644 --- a/pym/install/variables/net.py +++ b/pym/install/variables/net.py @@ -540,7 +540,7 @@ class VariableOsInstallNetRouteData(NetHelper, TableVariable): if not x[1] in ("off", "dhcp")] route_data = [] if staticInterface: - staticInterface, skipNet = zip(*staticInterface) + staticInterface, skipNet = list(zip(*staticInterface)) return [[x[0], x[1].get('via', ''), x[1].get('dev', ''), @@ -675,10 +675,10 @@ class VariableOsInstallNetRoute(NetHelper, ReadonlyVariable): """ def performRouteData(self, performFunc): - routeMatrix = zip(self.Get('os_install_net_route_network'), + routeMatrix = list(zip(self.Get('os_install_net_route_network'), self.Get('os_install_net_route_gw'), self.Get('os_install_net_route_dev'), - self.Get('os_install_net_route_src')) + self.Get('os_install_net_route_src'))) DEV, IP, CIDR, NET = 0, 1, 2, 1 return [performFunc(x[DEV], x[NET], routeMatrix) for x # ip and mask to ip/net