diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2024-02-10 14:15:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-13 13:51:41 +0000 |
commit | 605ef6f5a292fe169b1469b0a8996f3d5ae53daf (patch) | |
tree | 68ea616c466ade988cc324256d012e1ec6501942 /scripts | |
parent | 97eebe59d7ba9d7eb647a2f2a0353fc2424e9827 (diff) | |
download | poky-605ef6f5a292fe169b1469b0a8996f3d5ae53daf.tar.gz |
scripts: python 3.12 regex
All the regexes throw a warning like this:
WARNING: scripts/lib/recipetool/create_buildsys.py:140:
SyntaxWarning: invalid escape sequence '\s'
proj_re = re.compile('project\s*\(([^)]*)\)', re.IGNORECASE)
Python 3 interprets string literals as Unicode strings, and therefore
\s is treated as an escaped Unicode character which is not correct.
Declaring the RegEx pattern as a raw string instead of unicode is
required for Python 3.
(From OE-Core rev: 24b0ba00d4f0b4d9834f7693ecb6032dfc534a80)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/combo-layer | 2 | ||||
-rwxr-xr-x | scripts/contrib/bbvars.py | 6 | ||||
-rwxr-xr-x | scripts/contrib/convert-overrides.py | 8 | ||||
-rw-r--r-- | scripts/lib/checklayer/__init__.py | 4 | ||||
-rw-r--r-- | scripts/lib/recipetool/create.py | 12 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_buildsys.py | 38 | ||||
-rwxr-xr-x | scripts/oe-check-sstate | 2 | ||||
-rwxr-xr-x | scripts/oe-pkgdata-util | 2 | ||||
-rwxr-xr-x | scripts/opkg-query-helper.py | 2 | ||||
-rwxr-xr-x | scripts/patchtest-get-branch | 2 |
10 files changed, 39 insertions, 39 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 2312cef9ac..4a715914af 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -483,7 +483,7 @@ def check_repo_clean(repodir): | |||
483 | exit if repo is dirty | 483 | exit if repo is dirty |
484 | """ | 484 | """ |
485 | output=runcmd("git status --porcelain", repodir) | 485 | output=runcmd("git status --porcelain", repodir) |
486 | r = re.compile('\?\? patch-.*/') | 486 | r = re.compile(r'\?\? patch-.*/') |
487 | dirtyout = [item for item in output.splitlines() if not r.match(item)] | 487 | dirtyout = [item for item in output.splitlines() if not r.match(item)] |
488 | if dirtyout: | 488 | if dirtyout: |
489 | logger.error("git repo %s is dirty, please fix it first", repodir) | 489 | logger.error("git repo %s is dirty, please fix it first", repodir) |
diff --git a/scripts/contrib/bbvars.py b/scripts/contrib/bbvars.py index 090133600b..a9cdf082ab 100755 --- a/scripts/contrib/bbvars.py +++ b/scripts/contrib/bbvars.py | |||
@@ -36,8 +36,8 @@ def bbvar_is_documented(var, documented_vars): | |||
36 | def collect_documented_vars(docfiles): | 36 | def collect_documented_vars(docfiles): |
37 | ''' Walk the docfiles and collect the documented variables ''' | 37 | ''' Walk the docfiles and collect the documented variables ''' |
38 | documented_vars = [] | 38 | documented_vars = [] |
39 | prog = re.compile(".*($|[^A-Z_])<glossentry id=\'var-") | 39 | prog = re.compile(r".*($|[^A-Z_])<glossentry id=\'var-") |
40 | var_prog = re.compile('<glossentry id=\'var-(.*)\'>') | 40 | var_prog = re.compile(r'<glossentry id=\'var-(.*)\'>') |
41 | for d in docfiles: | 41 | for d in docfiles: |
42 | with open(d) as f: | 42 | with open(d) as f: |
43 | documented_vars += var_prog.findall(f.read()) | 43 | documented_vars += var_prog.findall(f.read()) |
@@ -45,7 +45,7 @@ def collect_documented_vars(docfiles): | |||
45 | return documented_vars | 45 | return documented_vars |
46 | 46 | ||
47 | def bbvar_doctag(var, docconf): | 47 | def bbvar_doctag(var, docconf): |
48 | prog = re.compile('^%s\[doc\] *= *"(.*)"' % (var)) | 48 | prog = re.compile(r'^%s\[doc\] *= *"(.*)"' % (var)) |
49 | if docconf == "": | 49 | if docconf == "": |
50 | return "?" | 50 | return "?" |
51 | 51 | ||
diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index 1939757f1b..c69acb4095 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py | |||
@@ -81,19 +81,19 @@ skip_ext = [".html", ".patch", ".m4", ".diff"] + args.skip_ext | |||
81 | 81 | ||
82 | vars_re = {} | 82 | vars_re = {} |
83 | for exp in vars: | 83 | for exp in vars: |
84 | vars_re[exp] = (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp) | 84 | vars_re[exp] = (re.compile(r'((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp) |
85 | 85 | ||
86 | shortvars_re = {} | 86 | shortvars_re = {} |
87 | for exp in shortvars: | 87 | for exp in shortvars: |
88 | shortvars_re[exp] = (re.compile('((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3") | 88 | shortvars_re[exp] = (re.compile(r'((^|[#\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + r'([\(\'"\s:])'), r"\1:" + exp + r"\3") |
89 | 89 | ||
90 | package_re = {} | 90 | package_re = {} |
91 | for exp in packagevars: | 91 | for exp in packagevars: |
92 | package_re[exp] = (re.compile('(^|[#\'"\s\-\+]+)' + exp + '_' + '([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2") | 92 | package_re[exp] = (re.compile(r'(^|[#\'"\s\-\+]+)' + exp + r'_' + r'([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2") |
93 | 93 | ||
94 | # Other substitutions to make | 94 | # Other substitutions to make |
95 | subs = { | 95 | subs = { |
96 | 'r = re.compile("([^:]+):\s*(.*)")' : 'r = re.compile("(^.+?):\s+(.*)")', | 96 | 'r = re.compile(r"([^:]+):\s*(.*)")' : 'r = re.compile(r"(^.+?):\s+(.*)")', |
97 | "val = d.getVar('%s_%s' % (var, pkg))" : "val = d.getVar('%s:%s' % (var, pkg))", | 97 | "val = d.getVar('%s_%s' % (var, pkg))" : "val = d.getVar('%s:%s' % (var, pkg))", |
98 | "f.write('%s_%s: %s\\n' % (var, pkg, encode(val)))" : "f.write('%s:%s: %s\\n' % (var, pkg, encode(val)))", | 98 | "f.write('%s_%s: %s\\n' % (var, pkg, encode(val)))" : "f.write('%s:%s: %s\\n' % (var, pkg, encode(val)))", |
99 | "d.getVar('%s_%s' % (scriptlet_name, pkg))" : "d.getVar('%s:%s' % (scriptlet_name, pkg))", | 99 | "d.getVar('%s_%s' % (scriptlet_name, pkg))" : "d.getVar('%s:%s' % (scriptlet_name, pkg))", |
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index 8271ed7fe3..62ecdfe390 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py | |||
@@ -324,8 +324,8 @@ def get_signatures(builddir, failsafe=False, machine=None, extravars=None): | |||
324 | else: | 324 | else: |
325 | raise | 325 | raise |
326 | 326 | ||
327 | sig_regex = re.compile("^(?P<task>.*:.*):(?P<hash>.*) .$") | 327 | sig_regex = re.compile(r"^(?P<task>.*:.*):(?P<hash>.*) .$") |
328 | tune_regex = re.compile("(^|\s)SIGGEN_LOCKEDSIGS_t-(?P<tune>\S*)\s*=\s*") | 328 | tune_regex = re.compile(r"(^|\s)SIGGEN_LOCKEDSIGS_t-(?P<tune>\S*)\s*=\s*") |
329 | current_tune = None | 329 | current_tune = None |
330 | with open(sigs_file, 'r') as f: | 330 | with open(sigs_file, 'r') as f: |
331 | for line in f.readlines(): | 331 | for line in f.readlines(): |
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index d2997cc242..8e9ff38db6 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -1166,12 +1166,12 @@ def crunch_license(licfile): | |||
1166 | # Note: these are carefully constructed! | 1166 | # Note: these are carefully constructed! |
1167 | license_title_re = re.compile(r'^#*\(? *(This is )?([Tt]he )?.{0,15} ?[Ll]icen[sc]e( \(.{1,10}\))?\)?[:\.]? ?#*$') | 1167 | license_title_re = re.compile(r'^#*\(? *(This is )?([Tt]he )?.{0,15} ?[Ll]icen[sc]e( \(.{1,10}\))?\)?[:\.]? ?#*$') |
1168 | license_statement_re = re.compile(r'^((This (project|software)|.{1,10}) is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the .{1,10} [Ll]icen[sc]e:?$') | 1168 | license_statement_re = re.compile(r'^((This (project|software)|.{1,10}) is( free software)? (released|licen[sc]ed)|(Released|Licen[cs]ed)) under the .{1,10} [Ll]icen[sc]e:?$') |
1169 | copyright_re = re.compile('^ *[#\*]* *(Modified work |MIT LICENSED )?Copyright ?(\([cC]\))? .*$') | 1169 | copyright_re = re.compile(r'^ *[#\*]* *(Modified work |MIT LICENSED )?Copyright ?(\([cC]\))? .*$') |
1170 | disclaimer_re = re.compile('^ *\*? ?All [Rr]ights [Rr]eserved\.$') | 1170 | disclaimer_re = re.compile(r'^ *\*? ?All [Rr]ights [Rr]eserved\.$') |
1171 | email_re = re.compile('^.*<[\w\.-]*@[\w\.\-]*>$') | 1171 | email_re = re.compile(r'^.*<[\w\.-]*@[\w\.\-]*>$') |
1172 | header_re = re.compile('^(\/\**!?)? ?[\-=\*]* ?(\*\/)?$') | 1172 | header_re = re.compile(r'^(\/\**!?)? ?[\-=\*]* ?(\*\/)?$') |
1173 | tag_re = re.compile('^ *@?\(?([Ll]icense|MIT)\)?$') | 1173 | tag_re = re.compile(r'^ *@?\(?([Ll]icense|MIT)\)?$') |
1174 | url_re = re.compile('^ *[#\*]* *https?:\/\/[\w\.\/\-]+$') | 1174 | url_re = re.compile(r'^ *[#\*]* *https?:\/\/[\w\.\/\-]+$') |
1175 | 1175 | ||
1176 | lictext = [] | 1176 | lictext = [] |
1177 | with open(licfile, 'r', errors='surrogateescape') as f: | 1177 | with open(licfile, 'r', errors='surrogateescape') as f: |
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py index d4b194f567..ec9d510e23 100644 --- a/scripts/lib/recipetool/create_buildsys.py +++ b/scripts/lib/recipetool/create_buildsys.py | |||
@@ -137,15 +137,15 @@ class CmakeRecipeHandler(RecipeHandler): | |||
137 | deps = [] | 137 | deps = [] |
138 | unmappedpkgs = [] | 138 | unmappedpkgs = [] |
139 | 139 | ||
140 | proj_re = re.compile('project\s*\(([^)]*)\)', re.IGNORECASE) | 140 | proj_re = re.compile(r'project\s*\(([^)]*)\)', re.IGNORECASE) |
141 | pkgcm_re = re.compile('pkg_check_modules\s*\(\s*[a-zA-Z0-9-_]+\s*(REQUIRED)?\s+([^)\s]+)\s*\)', re.IGNORECASE) | 141 | pkgcm_re = re.compile(r'pkg_check_modules\s*\(\s*[a-zA-Z0-9-_]+\s*(REQUIRED)?\s+([^)\s]+)\s*\)', re.IGNORECASE) |
142 | pkgsm_re = re.compile('pkg_search_module\s*\(\s*[a-zA-Z0-9-_]+\s*(REQUIRED)?((\s+[^)\s]+)+)\s*\)', re.IGNORECASE) | 142 | pkgsm_re = re.compile(r'pkg_search_module\s*\(\s*[a-zA-Z0-9-_]+\s*(REQUIRED)?((\s+[^)\s]+)+)\s*\)', re.IGNORECASE) |
143 | findpackage_re = re.compile('find_package\s*\(\s*([a-zA-Z0-9-_]+)\s*.*', re.IGNORECASE) | 143 | findpackage_re = re.compile(r'find_package\s*\(\s*([a-zA-Z0-9-_]+)\s*.*', re.IGNORECASE) |
144 | findlibrary_re = re.compile('find_library\s*\(\s*[a-zA-Z0-9-_]+\s*(NAMES\s+)?([a-zA-Z0-9-_ ]+)\s*.*') | 144 | findlibrary_re = re.compile(r'find_library\s*\(\s*[a-zA-Z0-9-_]+\s*(NAMES\s+)?([a-zA-Z0-9-_ ]+)\s*.*') |
145 | checklib_re = re.compile('check_library_exists\s*\(\s*([^\s)]+)\s*.*', re.IGNORECASE) | 145 | checklib_re = re.compile(r'check_library_exists\s*\(\s*([^\s)]+)\s*.*', re.IGNORECASE) |
146 | include_re = re.compile('include\s*\(\s*([^)\s]*)\s*\)', re.IGNORECASE) | 146 | include_re = re.compile(r'include\s*\(\s*([^)\s]*)\s*\)', re.IGNORECASE) |
147 | subdir_re = re.compile('add_subdirectory\s*\(\s*([^)\s]*)\s*([^)\s]*)\s*\)', re.IGNORECASE) | 147 | subdir_re = re.compile(r'add_subdirectory\s*\(\s*([^)\s]*)\s*([^)\s]*)\s*\)', re.IGNORECASE) |
148 | dep_re = re.compile('([^ ><=]+)( *[<>=]+ *[^ ><=]+)?') | 148 | dep_re = re.compile(r'([^ ><=]+)( *[<>=]+ *[^ ><=]+)?') |
149 | 149 | ||
150 | def find_cmake_package(pkg): | 150 | def find_cmake_package(pkg): |
151 | RecipeHandler.load_devel_filemap(tinfoil.config_data) | 151 | RecipeHandler.load_devel_filemap(tinfoil.config_data) |
@@ -423,16 +423,16 @@ class AutotoolsRecipeHandler(RecipeHandler): | |||
423 | 'makeinfo': 'texinfo', | 423 | 'makeinfo': 'texinfo', |
424 | } | 424 | } |
425 | 425 | ||
426 | pkg_re = re.compile('PKG_CHECK_MODULES\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*') | 426 | pkg_re = re.compile(r'PKG_CHECK_MODULES\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*') |
427 | pkgce_re = re.compile('PKG_CHECK_EXISTS\(\s*\[?([^,\]]*)\]?[),].*') | 427 | pkgce_re = re.compile(r'PKG_CHECK_EXISTS\(\s*\[?([^,\]]*)\]?[),].*') |
428 | lib_re = re.compile('AC_CHECK_LIB\(\s*\[?([^,\]]*)\]?,.*') | 428 | lib_re = re.compile(r'AC_CHECK_LIB\(\s*\[?([^,\]]*)\]?,.*') |
429 | libx_re = re.compile('AX_CHECK_LIBRARY\(\s*\[?[^,\]]*\]?,\s*\[?([^,\]]*)\]?,\s*\[?([a-zA-Z0-9-]*)\]?,.*') | 429 | libx_re = re.compile(r'AX_CHECK_LIBRARY\(\s*\[?[^,\]]*\]?,\s*\[?([^,\]]*)\]?,\s*\[?([a-zA-Z0-9-]*)\]?,.*') |
430 | progs_re = re.compile('_PROGS?\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*') | 430 | progs_re = re.compile(r'_PROGS?\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*') |
431 | dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?') | 431 | dep_re = re.compile(r'([^ ><=]+)( [<>=]+ [^ ><=]+)?') |
432 | ac_init_re = re.compile('AC_INIT\(\s*([^,]+),\s*([^,]+)[,)].*') | 432 | ac_init_re = re.compile(r'AC_INIT\(\s*([^,]+),\s*([^,]+)[,)].*') |
433 | am_init_re = re.compile('AM_INIT_AUTOMAKE\(\s*([^,]+),\s*([^,]+)[,)].*') | 433 | am_init_re = re.compile(r'AM_INIT_AUTOMAKE\(\s*([^,]+),\s*([^,]+)[,)].*') |
434 | define_re = re.compile('\s*(m4_)?define\(\s*([^,]+),\s*([^,]+)\)') | 434 | define_re = re.compile(r'\s*(m4_)?define\(\s*([^,]+),\s*([^,]+)\)') |
435 | version_re = re.compile('([0-9.]+)') | 435 | version_re = re.compile(r'([0-9.]+)') |
436 | 436 | ||
437 | defines = {} | 437 | defines = {} |
438 | def subst_defines(value): | 438 | def subst_defines(value): |
diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate index 4187e77458..0d171c4463 100755 --- a/scripts/oe-check-sstate +++ b/scripts/oe-check-sstate | |||
@@ -53,7 +53,7 @@ def check(args): | |||
53 | cmd = ['bitbake', '--dry-run', '--runall=build'] + args.target | 53 | cmd = ['bitbake', '--dry-run', '--runall=build'] + args.target |
54 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env) | 54 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env) |
55 | 55 | ||
56 | task_re = re.compile('NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') | 56 | task_re = re.compile(r'NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') |
57 | tasks = [] | 57 | tasks = [] |
58 | for line in output.decode('utf-8').splitlines(): | 58 | for line in output.decode('utf-8').splitlines(): |
59 | res = task_re.match(line) | 59 | res = task_re.match(line) |
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 7412cc1f47..44ae40549a 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util | |||
@@ -296,7 +296,7 @@ def package_info(args): | |||
296 | extra = '' | 296 | extra = '' |
297 | for line in f: | 297 | for line in f: |
298 | for var in vars: | 298 | for var in vars: |
299 | m = re.match(var + '(?::\S+)?:\s*(.+?)\s*$', line) | 299 | m = re.match(var + r'(?::\S+)?:\s*(.+?)\s*$', line) |
300 | if m: | 300 | if m: |
301 | vals[var] = m.group(1) | 301 | vals[var] = m.group(1) |
302 | pkg_version = vals['PKGV'] or '' | 302 | pkg_version = vals['PKGV'] or '' |
diff --git a/scripts/opkg-query-helper.py b/scripts/opkg-query-helper.py index bc3ab43823..084d9ef684 100755 --- a/scripts/opkg-query-helper.py +++ b/scripts/opkg-query-helper.py | |||
@@ -29,7 +29,7 @@ for arg in sys.argv[1:]: | |||
29 | args.append(arg) | 29 | args.append(arg) |
30 | 30 | ||
31 | # Regex for removing version specs after dependency items | 31 | # Regex for removing version specs after dependency items |
32 | verregex = re.compile(' \([=<>]* [^ )]*\)') | 32 | verregex = re.compile(r' \([=<>]* [^ )]*\)') |
33 | 33 | ||
34 | pkg = "" | 34 | pkg = "" |
35 | ver = "" | 35 | ver = "" |
diff --git a/scripts/patchtest-get-branch b/scripts/patchtest-get-branch index b5fb2b0f04..c6e242f8b6 100755 --- a/scripts/patchtest-get-branch +++ b/scripts/patchtest-get-branch | |||
@@ -16,7 +16,7 @@ import argparse | |||
16 | import re | 16 | import re |
17 | import git | 17 | import git |
18 | 18 | ||
19 | re_prefix = re.compile("(\[.*\])", re.DOTALL) | 19 | re_prefix = re.compile(r"(\[.*\])", re.DOTALL) |
20 | 20 | ||
21 | def get_branch(filepath_repo, filepath_mbox, default_branch): | 21 | def get_branch(filepath_repo, filepath_mbox, default_branch): |
22 | branch = None | 22 | branch = None |