annet 0.16.2__py3-none-any.whl → 0.16.3__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of annet might be problematic. Click here for more details.

Files changed (9) hide show
  1. annet/annlib/patching.py +6 -4
  2. annet/configs/context.yml +1 -1
  3. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/METADATA +1 -1
  4. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/RECORD +9 -9
  5. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/WHEEL +1 -1
  6. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/AUTHORS +0 -0
  7. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/LICENSE +0 -0
  8. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/entry_points.txt +0 -0
  9. {annet-0.16.2.dist-info → annet-0.16.3.dist-info}/top_level.txt +0 -0
annet/annlib/patching.py CHANGED
@@ -500,18 +500,20 @@ def _select_match(matches, rules):
500
500
 
501
501
  # Мерджим всех потомков которые заматчились
502
502
  local_children = odict()
503
+ global_children = odict()
503
504
  if is_f_cr_allowed:
504
505
  for (rule, is_cr_allowed) in map(operator.itemgetter(0), matches):
505
506
  if is_cr_allowed:
506
507
  local_children = merge_dicts(local_children, rule["children"]["local"])
507
508
  # optional break on is_cr_allowed==False?
508
509
 
510
+ global_children = merge_dicts(global_children, rule["children"]["global"])
511
+
512
+ global_children = merge_dicts(global_children, rules["global"])
513
+
509
514
  children_rules = {
510
515
  "local": local_children,
511
- "global": odict(
512
- (list(f_rule["children"]["global"].items()) if is_f_cr_allowed else [])
513
- + list(rules["global"].items()),
514
- ),
516
+ "global": global_children,
515
517
  }
516
518
 
517
519
  match = {"attrs": f_rule["attrs"]}
annet/configs/context.yml CHANGED
@@ -12,7 +12,7 @@ generators:
12
12
 
13
13
  storage:
14
14
  default:
15
- adapter: annet.adapters.file.provider
15
+ adapter: file
16
16
  params:
17
17
  path: /path/to/file
18
18
 
{annet-0.16.2.dist-info → annet-0.16.3.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: annet
3
- Version: 0.16.2
3
+ Version: 0.16.3
4
4
  Summary: annet
5
5
  Home-page: https://github.com/annetutil/annet
6
6
  License: MIT
{annet-0.16.2.dist-info → annet-0.16.3.dist-info}/RECORD RENAMED
@@ -43,7 +43,7 @@ annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,72
43
43
  annet/annlib/jsontools.py,sha256=4-2r_mPNbecKreuUr3vlLv3ykJdhRmyUD8AdF2nSAxc,5430
44
44
  annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
45
45
  annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
46
- annet/annlib/patching.py,sha256=GwG2lT4w-I1Ls3Eswn6SPJLBUVt2M3Ysw1fmXsWamYw,19793
46
+ annet/annlib/patching.py,sha256=Ojfl-LJHHTBLWx_6gV_02FjigqRt1DNaJD64L9iWp_0,19854
47
47
  annet/annlib/tabparser.py,sha256=9ry4DxZn6ibShd7fFtH_TElm3lT5tgMGkHcpGXNVuUY,25997
48
48
  annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
49
49
  annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -62,7 +62,7 @@ annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi
62
62
  annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
63
63
  annet/annlib/rulebook/common.py,sha256=Kd9Xout0xC6ZZDnyaORx0W-1kSM-gTgjQbp1iIXWxic,16489
64
64
  annet/api/__init__.py,sha256=KWoJfo2ByHC8EsIhU4szuhGwE8OKYS7Y1TN2xkhe0qA,33563
65
- annet/configs/context.yml,sha256=jzAQX9WbjFw_nsju8FLCCGfRc4ZXD0Mhb5pvO9emegI,413
65
+ annet/configs/context.yml,sha256=rXbeCmeYGaCEVVncwdouZIx5O7-PzABe4q-tfke0sSA,389
66
66
  annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
67
67
  annet/generators/__init__.py,sha256=ACMH9UQ4I3uq2b8nDzOn2dgYxreDq4_3ojOGwht0-No,15543
68
68
  annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
@@ -133,10 +133,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
133
133
  annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
134
134
  annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
135
135
  annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
136
- annet-0.16.2.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
137
- annet-0.16.2.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
138
- annet-0.16.2.dist-info/METADATA,sha256=YdQdLWLVxedQwFGAEbcsgOd3arNJ0M2DdRV8K9NxE_k,694
139
- annet-0.16.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
140
- annet-0.16.2.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
141
- annet-0.16.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
142
- annet-0.16.2.dist-info/RECORD,,
136
+ annet-0.16.3.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
137
+ annet-0.16.3.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
138
+ annet-0.16.3.dist-info/METADATA,sha256=eYoYqcjKGQl81clx9jffupesNMIfZn0XeiYX2so6U_k,694
139
+ annet-0.16.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
140
+ annet-0.16.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
141
+ annet-0.16.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
142
+ annet-0.16.3.dist-info/RECORD,,
{annet-0.16.2.dist-info → annet-0.16.3.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (75.1.0)
2
+ Generator: setuptools (75.2.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5