Skip to content

Commit ca23d22

Browse files
pieterlexispieterlexis
authored
Merge pull request #16518 from jsoref/codeql-pep8-first-argument-should-be-self
codeql PEP8 first argument should be self
2 parents c6f8764 + 4776f69 commit ca23d22

10 files changed

Lines changed: 36 additions & 15 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,11 @@ jobs:
307307
with:
308308
fetch-depth: 0
309309
persist-credentials: false
310-
- uses: astral-sh/ruff-action@v4.0.0
310+
- name: Check Python formatting
311+
uses: astral-sh/ruff-action@v4.0.0
311312
with:
312313
args: 'format --check --diff'
314+
- name: Check method variables
315+
uses: astral-sh/ruff-action@v4.0.0
316+
with:
317+
args: 'check --select N805'

‎regression-tests.auth-py/clientsubnetoption.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ def to_wire(self, file=None):
149149
file.write(data)
150150
return None
151151

152+
@classmethod
152153
def from_wire(cls, otype, wire, current, olen):
153154
"""Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.
154155
@@ -176,8 +177,6 @@ def from_wire(cls, otype, wire, current, olen):
176177

177178
return cls(ip, mask, scope, otype)
178179

179-
from_wire = classmethod(from_wire)
180-
181180
# needed in 2.0.0..
182181
@classmethod
183182
def from_wire_parser(cls, otype, parser):

‎regression-tests.common/paddingoption.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def to_wire(self, file=None):
2222
file.write(bytes(self.numberOfBytes))
2323
return None
2424

25+
@classmethod
2526
def from_wire(cls, otype, wire, current, olen):
2627
"""Read EDNS packet as defined in rfc7830.
2728
@@ -33,8 +34,6 @@ def from_wire(cls, otype, wire, current, olen):
3334

3435
return cls(numberOfBytes)
3536

36-
from_wire = classmethod(from_wire)
37-
3837
# needed in 2.0.0
3938
@classmethod
4039
def from_wire_parser(cls, otype, parser):
@@ -50,7 +49,7 @@ def to_text(self):
5049
def __eq__(self, other):
5150
if not isinstance(other, PaddingOption):
5251
return False
53-
return self.numberOfBytes == numberOfBytes
52+
return self.numberOfBytes == other.numberOfBytes
5453

5554
def __ne__(self, other):
5655
return not self.__eq__(other)

‎regression-tests.dnsdist/clientsubnetoption.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ def to_wire(self, file=None):
149149
file.write(data)
150150
return None
151151

152+
@classmethod
152153
def from_wire(cls, otype, wire, current, olen):
153154
"""Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.
154155
@@ -176,8 +177,6 @@ def from_wire(cls, otype, wire, current, olen):
176177

177178
return cls(ip, mask, scope, otype)
178179

179-
from_wire = classmethod(from_wire)
180-
181180
# needed in 2.0.0..
182181
@classmethod
183182
def from_wire_parser(cls, otype, parser):

‎regression-tests.dnsdist/cookiesoption.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def to_wire(self, file=None):
3535
file.write(data)
3636
return None
3737

38+
@classmethod
3839
def from_wire(cls, otype, wire, current, olen):
3940
"""Read EDNS packet as defined in draft-ietf-dnsop-cookies-09.
4041
@@ -54,8 +55,6 @@ def from_wire(cls, otype, wire, current, olen):
5455

5556
return cls(client, server)
5657

57-
from_wire = classmethod(from_wire)
58-
5958
# needed in 2.0.0
6059
@classmethod
6160
def from_wire_parser(cls, otype, parser):

‎regression-tests.dnsdist/test_BackendDiscovery.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,11 @@ class TestBackendDiscovery(DNSDistTest):
117117
"""
118118
_verboseMode = True
119119

120+
@staticmethod
120121
def NoSVCCallback(request):
121122
return dns.message.make_response(request).to_wire()
122123

124+
@staticmethod
123125
def NoUpgradePathCallback(request):
124126
response = dns.message.make_response(request)
125127
rrset = dns.rrset.from_text(
@@ -128,6 +130,7 @@ def NoUpgradePathCallback(request):
128130
response.answer.append(rrset)
129131
return response.to_wire()
130132

133+
@staticmethod
131134
def UpgradeDoTCallback(request):
132135
response = dns.message.make_response(request)
133136
rrset = dns.rrset.from_text(
@@ -151,6 +154,7 @@ def UpgradeDoTCallback(request):
151154
response.additional.append(rrset)
152155
return response.to_wire()
153156

157+
@staticmethod
154158
def UpgradeDoHCallback(request):
155159
response = dns.message.make_response(request)
156160
rrset = dns.rrset.from_text(
@@ -163,6 +167,7 @@ def UpgradeDoHCallback(request):
163167
response.answer.append(rrset)
164168
return response.to_wire()
165169

170+
@staticmethod
166171
def UpgradeDoTDifferentAddr1Callback(request):
167172
response = dns.message.make_response(request)
168173
rrset = dns.rrset.from_text(
@@ -175,6 +180,7 @@ def UpgradeDoTDifferentAddr1Callback(request):
175180
response.answer.append(rrset)
176181
return response.to_wire()
177182

183+
@staticmethod
178184
def UpgradeDoTDifferentAddr2Callback(request):
179185
response = dns.message.make_response(request)
180186
rrset = dns.rrset.from_text(
@@ -187,6 +193,7 @@ def UpgradeDoTDifferentAddr2Callback(request):
187193
response.answer.append(rrset)
188194
return response.to_wire()
189195

196+
@staticmethod
190197
def UpgradeDoTUnreachableCallback(request):
191198
response = dns.message.make_response(request)
192199
rrset = dns.rrset.from_text(
@@ -199,12 +206,14 @@ def UpgradeDoTUnreachableCallback(request):
199206
response.answer.append(rrset)
200207
return response.to_wire()
201208

209+
@staticmethod
202210
def BrokenResponseCallback(request):
203211
response = dns.message.make_response(request)
204212
response.use_edns(edns=False)
205213
response.question = []
206214
return response.to_wire()
207215

216+
@staticmethod
208217
def UpgradeDoHMissingPathCallback(request):
209218
response = dns.message.make_response(request)
210219
rrset = dns.rrset.from_text(
@@ -217,37 +226,44 @@ def UpgradeDoHMissingPathCallback(request):
217226
response.answer.append(rrset)
218227
return response.to_wire()
219228

229+
@staticmethod
220230
def EOFCallback(request):
221231
return None
222232

233+
@staticmethod
223234
def ServFailCallback(request):
224235
response = dns.message.make_response(request)
225236
response.set_rcode(dns.rcode.SERVFAIL)
226237
return response.to_wire()
227238

239+
@staticmethod
228240
def WrongNameCallback(request):
229241
query = dns.message.make_query("not-the-right-one.", dns.rdatatype.SVCB)
230242
response = dns.message.make_response(query)
231243
response.id = request.id
232244
return response.to_wire()
233245

246+
@staticmethod
234247
def WrongIDCallback(request):
235248
response = dns.message.make_response(request)
236249
response.id = request.id ^ 42
237250
return response.to_wire()
238251

252+
@staticmethod
239253
def TooManyQuestionsCallback(request):
240254
response = dns.message.make_response(request)
241255
response.question.append(response.question[0])
242256
return response.to_wire()
243257

258+
@staticmethod
244259
def BadQNameCallback(request):
245260
response = dns.message.make_response(request)
246261
wire = bytearray(response.to_wire())
247262
# mess up the first label length
248263
wire[12] = 0xFF
249264
return wire
250265

266+
@staticmethod
251267
def UpgradeDoTNoPortCallback(request):
252268
response = dns.message.make_response(request)
253269
rrset = dns.rrset.from_text(
@@ -260,6 +276,7 @@ def UpgradeDoTNoPortCallback(request):
260276
response.answer.append(rrset)
261277
return response.to_wire()
262278

279+
@staticmethod
263280
def UpgradeDoHNoPortCallback(request):
264281
response = dns.message.make_response(request)
265282
rrset = dns.rrset.from_text(

‎regression-tests.dnsdist/test_OutgoingDOH.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,7 @@ class TestOutgoingDOHBrokenResponsesOpenSSL(DNSDistTest, OutgoingDOHBrokenRespon
617617
addAction(SuffixMatchNodeRule(smn), PoolAction('cache'))
618618
"""
619619

620+
@staticmethod
620621
def callback(request, headers, fromQueue, toQueue, conn):
621622

622623
if str(request.question[0].name) == "500-status.broken-responses.outgoing-doh.test.powerdns.com.":
@@ -672,6 +673,7 @@ class TestOutgoingDOHBrokenResponsesGnuTLS(DNSDistTest, OutgoingDOHBrokenRespons
672673
"""
673674
_verboseMode = True
674675

676+
@staticmethod
675677
def callback(request, headers, fromQueue, toQueue, conn):
676678

677679
if str(request.question[0].name) == "500-status.broken-responses.outgoing-doh.test.powerdns.com.":
@@ -776,6 +778,7 @@ class TestOutgoingDOHXForwarded(DNSDistTest):
776778
"""
777779
_verboseMode = True
778780

781+
@staticmethod
779782
def callback(request, headersList, fromQueue, toQueue, conn):
780783
if str(request.question[0].name) == "a.root-servers.net.":
781784
# do not check headers on health-check queries

‎regression-tests.recursor-dnssec/clientsubnetoption.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def to_wire(self, file=None):
149149
file.write(data)
150150
return None
151151

152-
def from_wire(cls, otype, wire, current, olen):
152+
def from_wire(self, otype, wire, current, olen):
153153
"""Read EDNS packet as defined in draft-vandergaast-edns-client-subnet-01.
154154
155155
Returns:
@@ -174,7 +174,7 @@ def from_wire(cls, otype, wire, current, olen):
174174
else:
175175
raise Exception("Returned a family other then IPv4 or IPv6")
176176

177-
return cls(ip, mask, scope, otype)
177+
return self(ip, mask, scope, otype)
178178

179179
from_wire = classmethod(from_wire)
180180

‎regression-tests.recursor-dnssec/extendederrors.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def to_wire(self, file=None):
2727
file.write(data)
2828
return None
2929

30+
@classmethod
3031
def from_wire(cls, otype, wire, current, olen):
3132
"""Read EDNS packet.
3233
@@ -45,8 +46,6 @@ def from_wire(cls, otype, wire, current, olen):
4546

4647
return cls(code, extra)
4748

48-
from_wire = classmethod(from_wire)
49-
5049
# needed in 2.0.0
5150
@classmethod
5251
def from_wire_parser(cls, otype, parser):

‎regression-tests.recursor-dnssec/test_KeepOpenTCP.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ def generateRecursorConfig(cls, confdir):
3030
)
3131
super(KeepOpenTCPTest, cls).generateRecursorConfig(confdir)
3232

33-
def sendTCPQueryKeepOpen(cls, sock, query, timeout=2.0):
33+
@staticmethod
34+
def sendTCPQueryKeepOpen(sock, query, timeout=2.0):
3435
try:
3536
wire = query.to_wire()
3637
sock.send(struct.pack("!H", len(wire)))

0 commit comments

Comments
 (0)