fix merge conflict

This commit is contained in:
zilinzhu 2020-03-31 21:53:58 +08:00
parent 1a1b07304b
commit beea13b223

View File

@ -144,7 +144,7 @@ class BreakTransformer(converter.Base):
orelse=node.orelse)
new_for_node = node[0]
anno.copyanno(original_node, new_for_node, 'extra_test')
anno.copyanno(original_node, new_for_node, anno.Basic.EXTRA_LOOP_TEST)
anno.copyanno(original_node, new_for_node, anno.Basic.DIRECTIVES)
return node
@ -175,7 +175,7 @@ class BreakTransformer(converter.Base):
orelse=guarded_orelse)
new_for_node = node[1]
anno.setanno(new_for_node, 'extra_test', extra_test)
anno.setanno(new_for_node, anno.Basic.EXTRA_LOOP_TEST, extra_test)
anno.copyanno(original_node, new_for_node, anno.Basic.DIRECTIVES)
return node