cpython@c0919c2 (original) (raw)

`@@ -105,7 +105,7 @@ def get_ld_headers(file):

105

`# 2. If "INDEX" in occurs in a following line - return ld_header

106

`# 3. get info (lines starting with [0-9])

107

`ldr_headers = []

108

p = Popen(["/usr/bin/dump", "-X%s" % AIX_ABI, "-H", file],

108

p = Popen(["/usr/bin/dump", f"-X{AIX_ABI}", "-H", file],

109

`universal_newlines=True, stdout=PIPE, stderr=DEVNULL)

110

`# be sure to read to the end-of-file - getting all entries

111

`while True:

`@@ -140,7 +140,7 @@ def get_one_match(expr, lines):

140

` When there is a match, strip leading "[" and trailing "]"

141

` """

142

`# member names in the ld_headers output are between square brackets

143

expr = r'[(%s)]' % expr

143

expr = rf'[({expr})]'

144

`matches = list(filter(None, (re.search(expr, line) for line in lines)))

145

`if len(matches) == 1:

146

`return matches[0].group(1)

`@@ -197,8 +197,8 @@ def get_version(name, members):

197

`# any combination of additional 'dot' digits pairs are accepted

198

`# anything more than libFOO.so.digits.digits.digits

199

`# should be seen as a member name outside normal expectations

200

exprs = [r'lib%s.so.[0-9]+[0-9.]*' % name,

201

r'lib%s_?64.so.[0-9]+[0-9.]*' % name]

200

exprs = [rf'lib{name}.so.[0-9]+[0-9.]*',

201

rf'lib{name}_?64.so.[0-9]+[0-9.]*']

202

`for expr in exprs:

203

`versions = []

204

`for line in members:

`@@ -219,12 +219,12 @@ def get_member(name, members):

219

` and finally, legacy AIX naming scheme.

220

` """

221

`# look first for a generic match - prepend lib and append .so

222

expr = r'lib%s.so' % name

222

expr = rf'lib{name}.so'

223

`member = get_one_match(expr, members)

224

`if member:

225

`return member

226

`elif AIX_ABI == 64:

227

expr = r'lib%s64.so' % name

227

expr = rf'lib{name}64.so'

228

`member = get_one_match(expr, members)

229

`if member:

230

`return member

`@@ -277,7 +277,7 @@ def find_shared(paths, name):

277

`continue

278

`# "lib" is prefixed to emulate compiler name resolution,

279

`# e.g., -lc to libc

280

base = 'lib%s.a' % name

280

base = f'lib{name}.a'

281

`archive = path.join(dir, base)

282

`if path.exists(archive):

283

`members = get_shared(get_ld_headers(archive))

`@@ -308,7 +308,7 @@ def find_library(name):

308

`libpaths = get_libpaths()

309

` (base, member) = find_shared(libpaths, name)

310

`if base != None:

311

return "%s(%s)" % (base, member)

311

return f"{base}({member})"

312

313

`# To get here, a member in an archive has not been found

314

`# In other words, either:

`@@ -319,7 +319,7 @@ def find_library(name):

319

`# Note, the installation must prepare a link from a .so

320

`# to a versioned file

321

`# This is common practice by GNU libtool on other platforms

322

soname = "lib%s.so" % name

322

soname = f"lib{name}.so"

323

`for dir in libpaths:

324

`# /lib is a symbolic link to /usr/lib, skip it

325

`if dir == "/lib":