diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index 13b87c37f..6ef6d90ee 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -37,12 +37,11 @@ jobs: needs: build # 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version + # 'ubutunu-20.04' no longer works on 2.7 - TODO: re-added in a different way or remove support for it? runs-on: ubuntu-20.04 - container: - image: python:2.7.18-buster strategy: matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11'] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11'] fail-fast: false steps: diff --git a/addons/misra_9.py b/addons/misra_9.py index 02940c440..f0f733719 100644 --- a/addons/misra_9.py +++ b/addons/misra_9.py @@ -418,7 +418,7 @@ def misra_9_x(self, data, rule, rawTokens = None): has_var = True continue unknown_constant = True - cppcheckdata.reportError(sz, 'error', f'Unknown constant {t.str}, please review configuration', 'misra', 'config') + cppcheckdata.reportError(sz, 'error', 'Unknown constant {}, please review configuration'.format(t.str), 'misra', 'config') has_config_errors = True if t.isArithmeticalOp: tokens += [t.astOperand1, t.astOperand2]