Merge pull request #117 from juanjux/fix/tests

Fix .uast files

Author: juanjux

fixtures/annotations.py.uast

@@ -287,3 +287,4 @@ Module {
 .  }
 }
 
+

fixtures/aritmeticops.py.uast

@@ -507,3 +507,4 @@ Module {
 .  }
 }
 
+

fixtures/assert_constant.py.uast

@@ -137,3 +137,4 @@ Module {
 .  }
 }
 
+

fixtures/augassign.py.uast

@@ -236,3 +236,4 @@ Module {
 .  }
 }
 
+

fixtures/bitwise.py.uast

@@ -626,3 +626,4 @@ Module {
 .  }
 }
 
+

fixtures/classdef.py.uast

@@ -2,7 +2,7 @@ Status:  ok
 Errors: 
 UAST: 
 Module {
-.  Roles: File
+.  Roles: File,Module
 .  Children: {
 .  .  0: ClassDef {
 .  .  .  Roles: Type,Declaration,Identifier,Statement
@@ -45,13 +45,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: arguments {
-<<<<<<< HEAD
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Argument,Name,Identifier
-||||||| merged common ancestors
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument,Name,Identifier
-=======
 .  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument
->>>>>>> Remove Identifier from the arguments grouping node. Remove dups
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: args
 .  .  .  .  .  .  .  .  .  .  kwarg: <nil>
@@ -216,13 +210,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: arguments {
-<<<<<<< HEAD
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Argument,Name,Identifier
-||||||| merged common ancestors
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument,Name,Identifier
-=======
 .  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument
->>>>>>> Remove Identifier from the arguments grouping node. Remove dups
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: args
 .  .  .  .  .  .  .  .  .  .  kwarg: <nil>
@@ -457,13 +445,7 @@ Module {
 .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  2: arguments {
-<<<<<<< HEAD
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Argument,Name,Identifier
-||||||| merged common ancestors
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument,Name,Identifier
-=======
 .  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument
->>>>>>> Remove Identifier from the arguments grouping node. Remove dups
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: args
 .  .  .  .  .  .  .  .  .  .  kwarg: <nil>
@@ -485,13 +467,7 @@ Module {
 .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  Children: {
 .  .  .  .  .  .  .  .  0: arguments {
-<<<<<<< HEAD
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Argument,Name,Identifier
-||||||| merged common ancestors
-.  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument,Name,Identifier
-=======
 .  .  .  .  .  .  .  .  .  Roles: Function,Declaration,Incomplete,Argument
->>>>>>> Remove Identifier from the arguments grouping node. Remove dups
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: args
 .  .  .  .  .  .  .  .  .  .  kwarg: <nil>
@@ -1030,13 +1006,7 @@ Module {
 .  .  .  .  .  }
 .  .  .  .  .  Children: {
 .  .  .  .  .  .  0: Num {
-<<<<<<< HEAD
-.  .  .  .  .  .  .  Roles: Literal,Number,Expression,Primitive,Function,Declaration,Argument,Name,Identifier,Call,Argument,Positional
-||||||| merged common ancestors
-.  .  .  .  .  .  .  Roles: Literal,Number,Expression,Argument,Name,Identifier,Function,Call,Positional
-=======
-.  .  .  .  .  .  .  Roles: Literal,Number,Expression,Function,Call,Positional,Argument,Name
->>>>>>> Remove Identifier from the arguments grouping node. Remove dups
+.  .  .  .  .  .  .  Roles: Literal,Number,Expression,Primitive,Function,Call,Positional,Argument,Name
 .  .  .  .  .  .  .  TOKEN "5"
 .  .  .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  .  .  Offset: 269
@@ -1097,3 +1067,4 @@ Module {
 .  }
 }
 
+

fixtures/classdef_decorated.py.uast

@@ -68,3 +68,4 @@ Module {
 .  }
 }
 
+

fixtures/classdef_inheritance.py.uast

@@ -220,3 +220,4 @@ Module {
 .  }
 }
 
+

fixtures/classdef_metaclass_py2.py.uast

@@ -105,3 +105,4 @@ Module {
 .  }
 }
 
+

fixtures/classdef_metaclass_py3.py.uast

@@ -211,3 +211,4 @@ Module {
 .  }
 }
 
+