Skip to content

Commit 014a201

Browse files
thiellthiell
authored
tests: fix SyntaxWarning with Python 3.13 (#589)
Use raw strings to avoid the following with Python 3.13: tests/NodeSetGroupTest.py:146: SyntaxWarning: invalid escape sequence '\(' "sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
1 parent 4f805cf commit 014a201

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎tests/NodeSetGroupTest.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ def testGroupResolverSimple(self):
143143

144144
source = UpcallGroupSource(
145145
"simple",
146-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
147-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups1.name,
148-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups1.name,
146+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
147+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups1.name,
148+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups1.name,
149149
None)
150150

151151
# create custom resolver with default source
@@ -204,9 +204,9 @@ def testGroupResolverAddSourceError(self):
204204
test_groups1 = makeTestG1()
205205

206206
source = UpcallGroupSource("simple",
207-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
208-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups1.name,
209-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups1.name,
207+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
208+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups1.name,
209+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups1.name,
210210
None)
211211

212212
res = GroupResolver(source)
@@ -219,7 +219,7 @@ def testGroupResolverMinimal(self):
219219
test_groups1 = makeTestG1()
220220

221221
source = UpcallGroupSource("minimal",
222-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups1.name,
222+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups1.name,
223223
None, None, None)
224224

225225
# create custom resolver with default source
@@ -678,7 +678,7 @@ def testConfigResolverSources(self):
678678

679679
def testConfigCrossRefs(self):
680680
"""test groups config with cross references"""
681-
f = make_temp_file(dedent("""
681+
f = make_temp_file(dedent(r"""
682682
# A comment
683683
684684
[Main]
@@ -688,10 +688,10 @@ def testConfigCrossRefs(self):
688688
map: echo example[1-100]
689689
690690
[other]
691-
map: echo "foo: @local:foo" | sed -n 's/^$GROUP:\(.*\)/\\1/p'
691+
map: echo "foo: @local:foo" | sed -n 's/^$GROUP:\(.*\)/\1/p'
692692
693693
[third]
694-
map: printf "bar: @ref-rel\\nref-rel: @other:foo\\nref-all: @*\\n" | sed -n 's/^$GROUP:\(.*\)/\\1/p'
694+
map: printf "bar: @ref-rel\\nref-rel: @other:foo\\nref-all: @*\\n" | sed -n 's/^$GROUP:\(.*\)/\1/p'
695695
list: echo bar
696696
""").encode('ascii'))
697697
res = GroupResolverConfig(f.name)
@@ -934,9 +934,9 @@ def testGroupResolverND(self):
934934
test_groups4 = makeTestG4()
935935

936936
source = UpcallGroupSource("simple",
937-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups4.name,
938-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups4.name,
939-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups4.name,
937+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups4.name,
938+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups4.name,
939+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups4.name,
940940
None)
941941

942942
# create custom resolver with default source
@@ -1013,9 +1013,9 @@ def test_fromall_grouplist(self):
10131013
test_groups2 = makeTestG2()
10141014

10151015
source = UpcallGroupSource("simple",
1016-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups2.name,
1016+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups2.name,
10171017
None,
1018-
"sed -n 's/^\([0-9A-Za-z_\%%-]*\):.*/\\1/p' %s"
1018+
r"sed -n 's/^\([0-9A-Za-z_\%%-]*\):.*/\1/p' %s"
10191019
% test_groups2.name,
10201020
None)
10211021
res = GroupResolver(source)
@@ -1190,15 +1190,15 @@ def setUp(self):
11901190

11911191
# create 2 GroupSource objects
11921192
default = UpcallGroupSource("default",
1193-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % self.test_groups1.name,
1194-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % self.test_groups1.name,
1195-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % self.test_groups1.name,
1193+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % self.test_groups1.name,
1194+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % self.test_groups1.name,
1195+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % self.test_groups1.name,
11961196
None)
11971197

11981198
source2 = UpcallGroupSource("source2",
1199-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % self.test_groups2.name,
1200-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % self.test_groups2.name,
1201-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % self.test_groups2.name,
1199+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % self.test_groups2.name,
1200+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % self.test_groups2.name,
1201+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % self.test_groups2.name,
12021202
None)
12031203

12041204
resolver = GroupResolver(default)
@@ -1303,9 +1303,9 @@ def testGroupResolverReverse(self):
13031303
test_reverse3 = makeTestR3()
13041304

13051305
source = UpcallGroupSource("test",
1306-
"sed -n 's/^$GROUP:\(.*\)/\\1/p' %s" % test_groups3.name,
1307-
"sed -n 's/^all:\(.*\)/\\1/p' %s" % test_groups3.name,
1308-
"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\\1/p' %s" % test_groups3.name,
1306+
r"sed -n 's/^$GROUP:\(.*\)/\1/p' %s" % test_groups3.name,
1307+
r"sed -n 's/^all:\(.*\)/\1/p' %s" % test_groups3.name,
1308+
r"sed -n 's/^\([0-9A-Za-z_-]*\):.*/\1/p' %s" % test_groups3.name,
13091309
"awk -F: '/^$NODE:/ { gsub(\",\",\"\\n\",$2); print $2 }' %s" % test_reverse3.name)
13101310

13111311
# create custom resolver with default source

0 commit comments

Comments
 (0)