diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2023-08-15 17:13:17 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2023-08-15 17:56:59 +0300 |
| commit | f2764f165b23b2e9ae03849c84fb7ed310ed12b7 (patch) | |
| tree | 7563061bde0c8db6217ae298e81aa34f82e25b23 | |
| parent | 68e2201f28238209dc58f81a82ba5e3ccdf4d0f5 (diff) | |
Explicitly use count keyword argument to re.sub()
This avoids flake B034: sub should pass `count` and `flags` as keyword
arguments to avoid confusion due to unintuitive argument positions.
| -rw-r--r-- | calm/untest.py | 2 | ||||
| -rw-r--r-- | calm/version.py | 2 | ||||
| -rwxr-xr-x | test/test_calm.py | 8 | ||||
| -rw-r--r-- | test/test_entrypoints.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/calm/untest.py b/calm/untest.py index 7d6d774..7744108 100644 --- a/calm/untest.py +++ b/calm/untest.py @@ -53,7 +53,7 @@ def untest(pvr): content = fh.read() if re.search(r'^test:', content, re.MULTILINE): - content = re.sub(r'^test:\s*$', '', content, 0, re.MULTILINE) + content = re.sub(r'^test:\s*$', '', content, count=0, flags=re.MULTILINE) with open(fn, 'w') as fh: fh.write(content) diff --git a/calm/version.py b/calm/version.py index c61e8fc..5a4ce84 100644 --- a/calm/version.py +++ b/calm/version.py @@ -58,7 +58,7 @@ class SetupVersion: setattr(self, i, split[j]) sequences = re.finditer(r'(\d+|[a-zA-Z]+|[^a-zA-Z\d]+)', split[j]) sequences = [m for m in sequences if not re.match(r'[^a-zA-Z\d]+', m.group(1))] - sequences = [re.sub(r'^0+(\d)', r'\1', m.group(1), 1) for m in sequences] + sequences = [re.sub(r'^0+(\d)', r'\1', m.group(1), count=1) for m in sequences] setattr(self, '_' + i, sequences) def __str__(self): diff --git a/test/test_calm.py b/test/test_calm.py index 11697dc..819ce64 100755 --- a/test/test_calm.py +++ b/test/test_calm.py @@ -366,8 +366,8 @@ class CalmTest(unittest.TestCase): with open(args.inifile) as inifile: results = inifile.read() # fix the timestamp to match expected - results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1458221800', results, 1) - results = re.sub('generated at .*', 'generated at 2016-03-17 13:36:40 GMT', results, 1) + results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1458221800', results, count=1) + results = re.sub('generated at .*', 'generated at 2016-03-17 13:36:40 GMT', results, count=1) compare_with_expected_file(self, 'testdata/inifile', (results,), 'setup.ini') # XXX: delete a needed package, and check validate fails @@ -453,8 +453,8 @@ class CalmTest(unittest.TestCase): with open(os.path.join(args.rel_area, 'setup.ini')) as inifile: results = inifile.read() # fix the timestamp to match expected - results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1473797080', results, 1) - results = re.sub('generated at .*', 'generated at 2016-09-13 21:04:40 BST', results, 1) + results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1473797080', results, count=1) + results = re.sub('generated at .*', 'generated at 2016-09-13 21:04:40 BST', results, count=1) compare_with_expected_file(self, 'testdata/process_arch', (results,), 'setup.ini') for d in ARGDIRS: diff --git a/test/test_entrypoints.py b/test/test_entrypoints.py index 82b1f23..030ef96 100644 --- a/test/test_entrypoints.py +++ b/test/test_entrypoints.py @@ -67,8 +67,8 @@ class EntryPointsTest(unittest.TestCase): results = inifile.read() # fix the timestamp to match expected - results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1680890562', results, 1) - results = re.sub('generated at .*', 'generated at 2023-04-07 18:02:42 GMT.', results, 1) + results = re.sub('setup-timestamp: .*', 'setup-timestamp: 1680890562', results, count=1) + results = re.sub('generated at .*', 'generated at 2023-04-07 18:02:42 GMT.', results, count=1) compare_with_expected_file(self, 'testdata/mksetupini', results, 'setup.ini') |