1616# limitations under the License.
1717# -----------------------------------------------------------------------------
1818import os
19- from datetime import datetime , timedelta
19+ from datetime import datetime
2020import pytest
2121from tempfile import TemporaryDirectory
22- from ndn .encoding import Name , Component
22+ from ndn .encoding import Component
2323from ndn .app_support .light_versec import compile_lvs , Checker , SemanticError , DEFAULT_USER_FNS
2424from ndn .app_support .security_v2 import parse_certificate , derive_cert
2525from 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