|
17 | 17 | from bblfsh.pyuast import uast, iterator as native_iterator |
18 | 18 | from bblfsh.tree_order import TreeOrder |
19 | 19 |
|
20 | | -if "BBLFSH_COMPAT_SHUTUP" not in os.environ: |
21 | | - print("Warning: using deprecated bblfsh v1 compatibility layer.", |
22 | | - file=sys.stderr) |
| 20 | +print("Warning: using deprecated bblfsh v1 compatibility layer.", file=sys.stderr) |
23 | 21 |
|
24 | 22 |
|
25 | 23 | class WrongTypeException(Exception): |
@@ -109,15 +107,10 @@ def close(self) -> None: |
109 | 107 |
|
110 | 108 |
|
111 | 109 | class CompatNodeIterator: |
112 | | - def __init__( |
113 | | - self, |
114 | | - nodeit: NodeIterator, |
115 | | - only_nodes: bool = False |
116 | | - ) -> None: |
| 110 | + def __init__(self, nodeit: NodeIterator, only_nodes: bool = False) -> None: |
117 | 111 | self._nodeit = nodeit |
118 | 112 | self._only_nodes = only_nodes |
119 | 113 | # Used to forward calls of the old Node object |
120 | | - # Check if this, and properties(), are needed |
121 | 114 | self._last_node: Optional[Node] = None |
122 | 115 |
|
123 | 116 | def __iter__(self) -> 'CompatNodeIterator': |
@@ -158,8 +151,8 @@ def properties(self) -> dict: |
158 | 151 | return {} |
159 | 152 |
|
160 | 153 |
|
161 | | -def iterator(n: Union[Node, CompatNodeIterator], order: TreeOrder = TreeOrder.PRE_ORDER)\ |
162 | | - -> CompatNodeIterator: |
| 154 | +def iterator(n: Union[Node, CompatNodeIterator, dict], |
| 155 | + order: TreeOrder = TreeOrder.PRE_ORDER) -> CompatNodeIterator: |
163 | 156 |
|
164 | 157 | if isinstance(n, CompatNodeIterator): |
165 | 158 | return CompatNodeIterator(n._nodeit.iterate(order), only_nodes=True) |
|
0 commit comments