Merge pull request #136 from juanjux/fix/change_qualified

Fix/change qualified

Author: juanjux

driver/normalizer/annotation.go

@@ -156,9 +156,6 @@ var AnnotationRules = On(Any).Self(
 			argumentsAnn,
 		),
 
-		On(pyast.Attribute).Roles(uast.Identifier, uast.Expression).Children(
-			On(pyast.Name).Roles(uast.Qualified)),
-
 		On(pyast.Call).Roles(uast.Function, uast.Call, uast.Expression).Children(
 			On(HasInternalRole("args")).Roles(uast.Function, uast.Call, uast.Positional, uast.Argument, uast.Name),
 			On(HasInternalRole("keywords")).Roles(uast.Function, uast.Call, uast.Argument, uast.Name).Children(
@@ -187,6 +184,16 @@ var AnnotationRules = On(Any).Self(
 			On(HasInternalRole("value")).Roles(uast.Right),
 		),
 
+		// a.b.c ("a" and "b" will be Qualified, "c" will be just Identifier). Python does the
+		// reverse thing
+		On(pyast.Attribute).Self(
+			On(HasProperty("ctx", "Load")).Roles(uast.Qualified, uast.Identifier, uast.Expression),
+			On(HasProperty("ctx", "Store")).Roles(uast.Identifier, uast.Expression),
+			On(HasChild(pyast.Name)).Children(
+				On(Any).Roles(uast.Qualified), // Identifier and Expr added on all Name(s) below
+			),
+		),
+
 		On(pyast.Expression).Roles(uast.Expression),
 		On(pyast.Expr).Roles(uast.Expression),
 		On(pyast.Name).Roles(uast.Identifier, uast.Expression),

fixtures/annotations.py.source renamed to fixtures/annotations.py

@@ -1,5 +1,6 @@
 {
     "status": "ok",
+    "language": "",
     "errors": [],
     "ast": {
         "PY3AST": {

fixtures/annotations.py.native

@@ -1,4 +1,5 @@
 Status:  ok
+Language:  
 Errors: 
 UAST: 
 Module {

fixtures/annotations.py.uast

@@ -1,5 +1,6 @@
 {
     "status": "ok",
+    "language": "",
     "errors": [],
     "ast": {
         "PY3AST": {

fixtures/aritmeticops.py.source renamed to fixtures/aritmeticops.py

@@ -1,4 +1,5 @@
 Status:  ok
+Language:  
 Errors: 
 UAST: 
 Module {

fixtures/aritmeticops.py.native

@@ -1,5 +1,6 @@
 {
     "status": "ok",
+    "language": "",
     "errors": [],
     "ast": {
         "PY3AST": {

fixtures/aritmeticops.py.uast

@@ -1,4 +1,5 @@
 Status:  ok
+Language:  
 Errors: 
 UAST: 
 Module {