Python: Handle __all__ assigned to a tuple

RasmusWL · RasmusWL · commit ab3edf37d70d · 2021-03-31T17:25:19.000+02:00
Examples where this is used in real code: - https://github.com/django/django/blob/76c0b32f826469320c59709d31e2f2126dd7c505/django/core/files/temp.py#L24 - https://github.com/django/django/blob/76c0b32f826469320c59709d31e2f2126dd7c505/django/contrib/gis/gdal/__init__.py#L44-L49
diff --git a/python/ql/src/semmle/python/Module.qll b/python/ql/src/semmle/python/Module.qll
@@ -129,7 +129,11 @@ class Module extends Module_, Scope, AstNode {
       a.defines(all) and
       a.getScope() = this and
       all.getId() = "__all__" and
-      a.getValue().(List).getAnElt().(StrConst).getText() = name
+      (
+        a.getValue().(List).getAnElt().(StrConst).getText() = name
+        or
+        a.getValue().(Tuple).getAnElt().(StrConst).getText() = name
+      )
     )
   }
 
diff --git a/python/ql/test/library-tests/modules/__all__/DeclaredInAll.expected b/python/ql/test/library-tests/modules/__all__/DeclaredInAll.expected
@@ -1,3 +1,5 @@
 | all_dynamic.py:0:0:0:0 | Module all_dynamic | foo |
 | all_list.py:0:0:0:0 | Module all_list | bar |
 | all_list.py:0:0:0:0 | Module all_list | foo |
+| all_tuple.py:0:0:0:0 | Module all_tuple | bar |
+| all_tuple.py:0:0:0:0 | Module all_tuple | foo |

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,11 @@ class Module extends Module_, Scope, AstNode {`
`129`	`129`	`a.defines(all) and`
`130`	`130`	`a.getScope() = this and`
`131`	`131`	`all.getId() = "__all__" and`
`132`		`- a.getValue().(List).getAnElt().(StrConst).getText() = name`
	`132`	`+ (`
	`133`	`+ a.getValue().(List).getAnElt().(StrConst).getText() = name`
	`134`	`+ or`
	`135`	`+ a.getValue().(Tuple).getAnElt().(StrConst).getText() = name`
	`136`	`+ )`
`133`	`137`	`)`
`134`	`138`	`}`
`135`	`139`