Skip to content

Commit 11000fd

Browse files
committed
Python: Fix ModuleExport.ql test for Python 2
1 parent b7bdc55 commit 11000fd

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

python/ql/test/experimental/import-resolution/ModuleExport.expected

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@
103103
| if_then_else_refined | exit | if_then_else_refined.py:19:1:19:4 | ControlFlowNode for exit |
104104
| if_then_else_refined | globals | if_then_else_refined.py:17:24:17:30 | ControlFlowNode for globals |
105105
| if_then_else_refined | src | if_then_else_refined.py:17:19:17:21 | ControlFlowNode for src |
106-
| namespace_package.namespace_module | __file__ | namespace_package/namespace_module.py:6:6:6:13 | ControlFlowNode for __file__ |
107-
| namespace_package.namespace_module | __name__ | namespace_package/namespace_module.py:0:0:0:0 | GSSA Variable __name__ |
108-
| namespace_package.namespace_module | __package__ | namespace_package/namespace_module.py:0:0:0:0 | GSSA Variable __package__ |
109-
| namespace_package.namespace_module | enter | namespace_package/namespace_module.py:2:1:2:5 | ControlFlowNode for enter |
110-
| namespace_package.namespace_module | exit | namespace_package/namespace_module.py:6:1:6:4 | ControlFlowNode for exit |
111-
| namespace_package.namespace_module | namespace_module_attr | namespace_package/namespace_module.py:4:1:4:21 | GSSA Variable namespace_module_attr |
112106
| package.__init__ | __file__ | package/__init__.py:7:6:7:13 | ControlFlowNode for __file__ |
113107
| package.__init__ | __name__ | package/__init__.py:0:0:0:0 | GSSA Variable __name__ |
114108
| package.__init__ | __package__ | package/__init__.py:0:0:0:0 | GSSA Variable __package__ |

python/ql/test/experimental/import-resolution/ModuleExport.ql

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ where
77
ImportResolution::module_export(m, name, defn) and
88
exists(m.getLocation().getFile().getRelativePath()) and
99
not defn.getScope() = any(Module trace | trace.getName() = "trace") and
10-
not m.getName() = "main"
10+
not m.getName() = "main" and
11+
// Since we test on both Python 2 and Python 3, but `namespace_package` is not allowed
12+
// on Python 2 because of the missing `__init__.py` files, we remove those results
13+
// from Python 3 tests as well. One alternative is to only run these tests under
14+
// Python 3, but that does not seems like a good solution -- we could easily miss a
15+
// Python 2 only regression then :O
16+
not m.getName() = "namespace_package.namespace_module"
1117
select m.getName(), name, defn

0 commit comments

Comments
 (0)