From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 27 Jan 2023 20:21:51 +0000 (+0100)
Subject: ukify: python 3.9 compat followup
X-Git-Tag: v253-rc2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c811aba082f55aeb64aaf50a9b70ffb41308af12;p=thirdparty%2Fsystemd.git

ukify: python 3.9 compat followup
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index b00b9fd9001..5ac4f63fcc2 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -440,6 +440,12 @@ def join_initrds(initrds):
     return b''.join(seq)
 
 
+def pairwise(iterable):
+    a, b = itertools.tee(iterable)
+    next(b, None)
+    return zip(a, b)
+
+
 def pe_validate(filename):
     import pefile
 
@@ -447,7 +453,7 @@ def pe_validate(filename):
 
     sections = sorted(pe.sections, key=lambda s: (s.VirtualAddress, s.Misc_VirtualSize))
 
-    for l, r in itertools.pairwise(sections):
+    for l, r in pairwise(sections):
         if l.VirtualAddress + l.Misc_VirtualSize > r.VirtualAddress + r.Misc_VirtualSize:
             raise ValueError(f'Section "{l.Name.decode()}" ({l.VirtualAddress}, {l.Misc_VirtualSize}) overlaps with section "{r.Name.decode()}" ({r.VirtualAddress}, {r.Misc_VirtualSize})')