Debian Codegraph @

debian/patches/pyw

raw
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Alex Myczko <[email protected]>
3 Date: May, 31 2026 20:23:40 +0200
4 Subject: [PATCH] <short summary of the patch>
5
6 TODO: Put a short summary on the line above and replace this paragraph
7 with a longer explanation of this change. Complete the meta-information
8 with other relevant fields (see below for details). To make it easier, the
9 information below has been extracted from the changelog. Adjust it or drop
10 it.
11
12 Bug-Debian: https://bugs.debian.org/1085739
13 Bug-Debian: https://bugs.debian.org/1091216
14 ---
15 The information above should follow the Patch Tagging Guidelines, please
16 checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
17 are templates for supplementary fields that you might want to add:
18
19 Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
20 Bug: <upstream-bugtracker-url>
21 Bug-<Vendor>: <vendor-bugtracker-url>
22 Forwarded: (no|not-needed|<patch-forwarded-url>)
23 Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
24 Reviewed-By: <name and email of someone who approved/reviewed the patch>
25
26 --- nfstest-3.2.orig/baseobj.py
27 +++ nfstest-3.2/baseobj.py
28 @@ -461,7 +461,7 @@ class BaseObj(object):
29 if isinstance(level, str):
30 # Convert named verbose levels to a number
31 # -- Get a list of all named verbose levels
32 - for item in sorted(set(re.split('\W+', level))):
33 + for item in sorted(set(re.split(r'\W+', level))):
34 if len(item) > 0:
35 if item in _debug_map:
36 # Replace all occurrences of named verbose level
37 --- nfstest-3.2.orig/formatstr.py
38 +++ nfstest-3.2/formatstr.py
39 @@ -258,7 +258,7 @@ class FormatStr(Formatter):
40 out = x.format("{0:?tuple({0}, {1})}", 1, 2) # out = "tuple(1, 2)"
41 out = x.format("{0:?tuple({0}, {1})}", None, 2) # out = ""
42 # Using 'else' format (including the escaping of else character):
43 - out = x.format("{0:?sid\:{0}:NONE}", 5) # out = "sid:5"
44 + out = x.format(r"{0:?sid\:{0}:NONE}", 5) # out = "sid:5"
45 out = x.format("{0:?sid\:{0}:NONE}", None) # out = "NONE"
46
47 # Nested formatting for strings, where processing is done in
48 --- nfstest-3.2.orig/nfstest/file_io.py
49 +++ nfstest-3.2/nfstest/file_io.py
50 @@ -311,7 +311,7 @@ class FileIO(BaseObj):
51
52 # Get size multiplier
53 sizemult = kwargs.pop("sizemult", P_SIZEMULT)
54 - if re.search("^[\d\.]+$", sizemult):
55 + if re.search(r"^[\d\.]+$", sizemult):
56 self.sizemult = float(sizemult)
57 else:
58 self.sizemult = float(int_units(sizemult))
59 @@ -1060,7 +1060,7 @@ class FileIO(BaseObj):
60 process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
61 pstdout, pstderr = process.communicate()
62 for line in pstdout.decode().split("\n"):
63 - regex = re.search("Stats for\s+(.*):", line)
64 + regex = re.search(r"Stats for\s+(.*):", line)
65 if regex:
66 self.dprint("INFO", regex.group(1))
67 else:
68 --- nfstest-3.2.orig/nfstest/test_util.py
69 +++ nfstest-3.2/nfstest/test_util.py
70 @@ -879,7 +879,7 @@ class TestUtil(NFSUtil):
71 lines.append(optline.rstrip())
72 # Process valid options, option name and value is separated
73 # by spaces or an equal sign
74 - m = re.search("([^=\s]+)\s*=?\s*(.*)", line)
75 + m = re.search(r"([^=\s]+)\s*=?\s*(.*)", line)
76 name = m.group(1)
77 name = name.strip()
78 value = m.group(2)
79 @@ -1116,14 +1116,14 @@ class TestUtil(NFSUtil):
80
81 # Find if any of the test options are regular expressions
82 for key in self.testopts.keys():
83 - m = re.search("^re\((.*)\)$", key)
84 + m = re.search(r"^re\((.*)\)$", key)
85 if m:
86 # Regular expression specified by re()
87 regex = m.group(1)
88 else:
89 # Find if regular expression is specified by the characters
90 # used in the name
91 - m = re.search("[.^$?+\\\[\]()|]", key)
92 + m = re.search(r"[.^$?+\\\[\]()|]", key)
93 regex = key
94 if m and re.search(regex, name):
95 # Key is specified as a regular expression and matches
96 --- nfstest-3.2.orig/packet/nfs/nfs4.py
97 +++ nfstest-3.2/packet/nfs/nfs4.py
98 @@ -4810,7 +4810,7 @@ class write_response4(BaseObj):
99 };
100 """
101 # Class attributes
102 - _strfmt1 = "{0:?stid\:{0} }len:{1:umax64} verf:{3} {2}"
103 + _strfmt1 = r"{0:?stid\:{0} }len:{1:umax64} verf:{3} {2}"
104 _attrlist = ("stateid", "count", "committed", "verifier")
105
106 def __init__(self, unpack):
107 --- nfstest-3.2.orig/packet/transport/ib.py
108 +++ nfstest-3.2/packet/transport/ib.py
109 @@ -559,7 +559,7 @@ class IB(BaseObj):
110 "psize", "icrc", "vcrc")
111 _fattrs = ("bth",)
112 _strfmt1 = "{1}{1:? }{0}{0:? }{_strname:<5} {2}{_size:? size={_size}}{6:? }{6}{8:? }{8}"
113 - _strfmt2 = "{2}{_size:?, size\: {_size}}{6:?, }{6}{8:?, }{8}"
114 + _strfmt2 = r"{2}{_size:?, size\: {_size}}{6:?, }{6}{8:?, }{8}"
115 _senddata = {}
116
117 def __init__(self, pktt):
118 --- nfstest-3.2.orig/packet/transport/rdmap.py
119 +++ nfstest-3.2/packet/transport/rdmap.py
120 @@ -82,7 +82,7 @@ class RDMAP(BaseObj):
121 _attrlist = ("version", "opcode", "istag", "sinkstag", "sinksto",
122 "dma_len", "srcstag", "srcsto", "psize")
123 _strfmt1 = "RDMAP v{0:<3} {1} {_ddp}, len: {8}"
124 - _strfmt2 = "{1}, version: {0},{2:? istag\: {2},:} len: {8}"
125 + _strfmt2 = r"{1}, version: {0},{2:? istag\: {2},:} len: {8}"
126 _senddata = {}
127
128 def __init__(self, pktt, pinfo):
129 --- nfstest-3.2.orig/tools/create_manpage.py
130 +++ nfstest-3.2/tools/create_manpage.py
131 @@ -226,8 +226,8 @@ def create_manpage(src, dst):
132 pstdout, pstderr = proc.communicate()
133 proc.wait()
134 lines = re.sub('Total time:.*', '', pstdout.decode())
135 - lines = re.sub('TIME:\s+[0-9.]+s.*', '', lines)
136 - lines = re.sub('0 tests \(0 passed, 0 failed\)', '', lines)
137 + lines = re.sub(r'TIME:\s+[0-9.]+s.*', '', lines)
138 + lines = re.sub(r'0 tests \(0 passed, 0 failed\)', '', lines)
139 lines = lines.split('\n')
140 while lines[-1] == "":
141 lines.pop()