diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-17 13:27:58 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-02-17 04:41:08 -1000 |
| commit | a4cd5b0b4b355b7b75fb48c61289700e3e908b2a (patch) | |
| tree | c720c25e65848677315c5885280ed77707cd4671 | |
| parent | 657940c7c2a9dea4963a5063e4bf900d6b454903 (diff) | |
| download | bitbake-contrib-a4cd5b0b4b355b7b75fb48c61289700e3e908b2a.tar.gz | |
cooker: Drop sre_constants usage
As reported by Martin Jansa <Martin.Jansa@gmail.com>:
bitbake/lib/bb/cooker.py:16: DeprecationWarning: module 'sre_constants' is deprecated
import sre_constants
it's deprecated since 3.11 with:
https://github.com/python/cpython/issues/91308
The correct replacement for our usage is re.error so use that instead.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | lib/bb/cooker.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index ac54d4378..6743bce58 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -13,7 +13,6 @@ import sys, os, glob, os.path, re, time import itertools import logging import multiprocessing -import sre_constants import threading from io import StringIO, UnsupportedOperation from contextlib import closing @@ -1795,7 +1794,7 @@ class CookerCollectFiles(object): try: re.compile(mask) bbmasks.append(mask) - except sre_constants.error: + except re.error: collectlog.critical("BBMASK contains an invalid regular expression, ignoring: %s" % mask) # Then validate the combined regular expressions. This should never @@ -1803,7 +1802,7 @@ class CookerCollectFiles(object): bbmask = "|".join(bbmasks) try: bbmask_compiled = re.compile(bbmask) - except sre_constants.error: + except re.error: collectlog.critical("BBMASK is not a valid regular expression, ignoring: %s" % bbmask) bbmask = None |