annet 0.16.3__py3-none-any.whl → 0.16.4__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.
- annet/annlib/diff.py +2 -5
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/METADATA +1 -1
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/RECORD +8 -8
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/AUTHORS +0 -0
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/LICENSE +0 -0
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/WHEEL +0 -0
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/entry_points.txt +0 -0
- {annet-0.16.3.dist-info → annet-0.16.4.dist-info}/top_level.txt +0 -0
annet/annlib/diff.py
CHANGED
|
@@ -59,9 +59,8 @@ def diff_cmp(diff_l, diff_r):
|
|
|
59
59
|
(op_l, line_l, _, _) = diff_l
|
|
60
60
|
(op_r, line_r, _, _) = diff_r
|
|
61
61
|
|
|
62
|
-
cmp_line = (line_l > line_r) - (line_l < line_r)
|
|
63
62
|
cmp_op = ops_order[op_l] - ops_order[op_r]
|
|
64
|
-
if
|
|
63
|
+
if line_l == line_r:
|
|
65
64
|
# При равенстве строк порядок определяется операцией
|
|
66
65
|
return cmp_op
|
|
67
66
|
|
|
@@ -101,9 +100,7 @@ def diff_cmp(diff_l, diff_r):
|
|
|
101
100
|
else:
|
|
102
101
|
continue
|
|
103
102
|
break
|
|
104
|
-
|
|
105
|
-
return res
|
|
106
|
-
return cmp_line
|
|
103
|
+
return res
|
|
107
104
|
|
|
108
105
|
|
|
109
106
|
def resort_diff(diff: Diff) -> Diff:
|
|
@@ -37,7 +37,7 @@ annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
|
|
|
37
37
|
annet/adapters/netbox/v37/storage.py,sha256=TonXJuR6ng6xiczHsxsm0Zlo5Wokl3N_Uqg4r7HHj6c,8421
|
|
38
38
|
annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
|
|
39
39
|
annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
|
|
40
|
-
annet/annlib/diff.py,sha256=
|
|
40
|
+
annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
|
|
41
41
|
annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
|
|
42
42
|
annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,7203
|
|
43
43
|
annet/annlib/jsontools.py,sha256=4-2r_mPNbecKreuUr3vlLv3ykJdhRmyUD8AdF2nSAxc,5430
|
|
@@ -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.
|
|
137
|
-
annet-0.16.
|
|
138
|
-
annet-0.16.
|
|
139
|
-
annet-0.16.
|
|
140
|
-
annet-0.16.
|
|
141
|
-
annet-0.16.
|
|
142
|
-
annet-0.16.
|
|
136
|
+
annet-0.16.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
|
|
137
|
+
annet-0.16.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
|
|
138
|
+
annet-0.16.4.dist-info/METADATA,sha256=EbbpV0pTkqx0-Q0g3IZgFr9wyQkIHAxeYrMFOafVOm8,694
|
|
139
|
+
annet-0.16.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
|
|
140
|
+
annet-0.16.4.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
|
|
141
|
+
annet-0.16.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
|
|
142
|
+
annet-0.16.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|