Skip to content

Commit 7618fb6

Browse files
committed
style: Fix some lint warnings
1 parent 70c67c0 commit 7618fb6

4 files changed

Lines changed: 16 additions & 18 deletions

File tree

src/ndn/app_support/light_versec/checker.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ def suggest(self, pkt_name: NonStrictName, keychain: Keychain) -> FormalName:
308308
if self.check(cert_name, cert.signature_info.key_locator.name):
309309
return cert_name
310310

311+
311312
DEFAULT_USER_FNS = {
312313
'$eq': lambda c, args: all(x == c for x in args),
313314
'$eq_type': lambda c, args: all(Component.get_type(x) == Component.get_type(c) for x in args),

src/ndn/app_support/light_versec/compiler.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
# -----------------------------------------------------------------------------
2323
from __future__ import annotations
2424

25-
import typing
26-
2725
import lark
2826
from typing import TypeVar, Union, Optional
2927
from dataclasses import dataclass

tests/integration/app_v2_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ async def face_proc(self, face: DummyFace):
5757
b'\x15\rHello, world!')
5858

5959
async def app_main(self):
60-
name = f'/example/testApp/randomData/t=1570430517101'
60+
name = '/example/testApp/randomData/t=1570430517101'
6161
data_name, content, pkt_context = await self.app.express(
6262
name, app.pass_all, must_be_fresh=True, can_be_prefix=False, lifetime=6000, nonce=None)
6363
assert data_name == enc.Name.from_str(name)
@@ -199,7 +199,7 @@ async def face_proc(self, face: DummyFace):
199199
b'\x15\rHello, world!')
200200

201201
async def app_main(self):
202-
name = f'/example/testApp/randomData/t=1570430517101'
202+
name = '/example/testApp/randomData/t=1570430517101'
203203
_, _, pkt_context = await self.app.express(
204204
name, validator=app.pass_all,
205205
must_be_fresh=True, can_be_prefix=False, lifetime=6000, nonce=None, need_raw_packet=True)

tests/misc/light_versec_test.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
# limitations under the License.
1717
# -----------------------------------------------------------------------------
1818
import os
19-
from datetime import datetime, timedelta
19+
from datetime import datetime
2020
import pytest
2121
from tempfile import TemporaryDirectory
22-
from ndn.encoding import Name, Component
22+
from ndn.encoding import Component
2323
from ndn.app_support.light_versec import compile_lvs, Checker, SemanticError, DEFAULT_USER_FNS
2424
from ndn.app_support.security_v2 import parse_certificate, derive_cert
2525
from ndn.security import KeychainSqlite3, TpmFile
@@ -301,9 +301,9 @@ def test_complicated_rule():
301301
assert checker.check('/x/y/z', '/xxx/xxx/xxx')
302302
assert checker.check('/x/x/x', '/xxx/yyy/zzz')
303303
assert checker.check('/a/a/a', '/xxx/xxx/xxx')
304-
304+
305305
@staticmethod
306-
def test_signing_suggest():
306+
def test_signing_suggest():
307307
with TemporaryDirectory() as tmpdirname:
308308
pib_file = os.path.join(tmpdirname, 'pib.db')
309309
tpm_dir = os.path.join(tmpdirname, 'privKeys')
@@ -318,9 +318,9 @@ def test_signing_suggest():
318318
la_signer = keychain.get_signer({'cert': la_cert_name})
319319

320320
la_author_id = keychain.touch_identity('/la/author/1')
321-
la_author_cert_name, la_author_cert = derive_cert(la_author_id.default_key().name,
322-
Component.from_str('la-signer'),
323-
la_cert_data.content, la_signer,
321+
la_author_cert_name, la_author_cert = derive_cert(la_author_id.default_key().name,
322+
Component.from_str('la-signer'),
323+
la_cert_data.content, la_signer,
324324
datetime.utcnow(), 100)
325325
keychain.import_cert(la_id.default_key().name, la_author_cert_name, la_author_cert)
326326

@@ -331,13 +331,12 @@ def test_signing_suggest():
331331
ny_signer = keychain.get_signer({'cert': ny_cert_name})
332332

333333
ny_author_id = keychain.touch_identity('/ny/author/2')
334-
ny_author_cert_name, ny_author_cert = derive_cert(ny_author_id.default_key().name,
334+
ny_author_cert_name, ny_author_cert = derive_cert(ny_author_id.default_key().name,
335335
Component.from_str('ny-signer'),
336-
ny_cert_data.content, ny_signer,
336+
ny_cert_data.content, ny_signer,
337337
datetime.utcnow(), 100)
338338
keychain.import_cert(ny_id.default_key().name, ny_author_cert_name, ny_author_cert)
339339

340-
341340
lvs = r'''
342341
#KEY: "KEY"/_/_/_
343342
#article: /"article"/_topic/_ & { _topic: "eco" | "spo" } <= #author
@@ -348,7 +347,7 @@ def test_signing_suggest():
348347

349348
assert checker.suggest("/article/eco/day1", keychain) == la_author_cert_name
350349
assert checker.suggest("/article/life/day1", keychain) is None
351-
350+
352351
lvs = r'''
353352
#KEY: "KEY"/_/_/_
354353
#LAKEY: "KEY"/_/_signer/_ & { _signer: "la-signer" }
@@ -358,7 +357,7 @@ def test_signing_suggest():
358357
'''
359358
checker = Checker(compile_lvs(lvs), {})
360359
assert checker.suggest("/article/eco/day1", keychain) == la_author_cert_name
361-
360+
362361
lvs = r'''
363362
#KEY: "KEY"/_/_/_version & { _version: $eq_type("v=0") }
364363
#article: /"article"/_topic/_ & { _topic: "life" | "fin" } <= #author
@@ -367,7 +366,7 @@ def test_signing_suggest():
367366
'''
368367
checker = Checker(compile_lvs(lvs), DEFAULT_USER_FNS)
369368
assert checker.suggest("/article/fin/day1", keychain) == ny_author_cert_name
370-
369+
371370
lvs = r'''
372371
#KEY: "KEY"/_/_/_version & { _version: $eq_type("v=0") }
373372
#NYKEY: "KEY"/_/_signer/_version& { _signer: "ny-signer", _version: $eq_type("v=0")}
@@ -377,4 +376,4 @@ def test_signing_suggest():
377376
#site: "ny"
378377
'''
379378
checker = Checker(compile_lvs(lvs), DEFAULT_USER_FNS)
380-
assert checker.suggest("/article/eco/day1", keychain) == ny_author_cert_name
379+
assert checker.suggest("/article/eco/day1", keychain) == ny_author_cert_name

0 commit comments

Comments
 (0)