Skip to content

Commit 7527f13

Browse files
tausbntausbn
authored
Merge pull request #2283 from RasmusWL/python-fix-python2-specific-tests
Python: fix python2 specific tests
2 parents 9986de8 + 358964b commit 7527f13

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

‎python/ql/test/2/library-tests/classes/attr/list_attr.expected‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
| builtin-class list | __add__ | Builtin-method __add__ |
2+
| builtin-class list | __class__ | Property __class__ |
23
| builtin-class list | __contains__ | Builtin-method __contains__ |
4+
| builtin-class list | __delattr__ | Builtin-method __delattr__ |
35
| builtin-class list | __delitem__ | Builtin-method __delitem__ |
46
| builtin-class list | __delslice__ | Builtin-method __delslice__ |
57
| builtin-class list | __doc__ | str b'list() -> new empty list\nlist(iterable) -> new list initialized from iterable's items' |
68
| builtin-class list | __eq__ | Builtin-method __eq__ |
9+
| builtin-class list | __format__ | Builtin-method __format__ |
710
| builtin-class list | __ge__ | Builtin-method __ge__ |
811
| builtin-class list | __getattribute__ | Builtin-method __getattribute__ |
912
| builtin-class list | __getitem__ | Builtin-method __getitem__ |
@@ -20,12 +23,17 @@
2023
| builtin-class list | __mul__ | Builtin-method __mul__ |
2124
| builtin-class list | __ne__ | Builtin-method __ne__ |
2225
| builtin-class list | __new__ | builtin_function_or_method __new__ |
26+
| builtin-class list | __reduce__ | Builtin-method __reduce__ |
27+
| builtin-class list | __reduce_ex__ | Builtin-method __reduce_ex__ |
2328
| builtin-class list | __repr__ | Builtin-method __repr__ |
2429
| builtin-class list | __reversed__ | Builtin-method __reversed__ |
2530
| builtin-class list | __rmul__ | Builtin-method __rmul__ |
31+
| builtin-class list | __setattr__ | Builtin-method __setattr__ |
2632
| builtin-class list | __setitem__ | Builtin-method __setitem__ |
2733
| builtin-class list | __setslice__ | Builtin-method __setslice__ |
2834
| builtin-class list | __sizeof__ | Builtin-method __sizeof__ |
35+
| builtin-class list | __str__ | Builtin-method __str__ |
36+
| builtin-class list | __subclasshook__ | classmethod_descriptor __subclasshook__ |
2937
| builtin-class list | append | Builtin-method append |
3038
| builtin-class list | count | Builtin-method count |
3139
| builtin-class list | extend | Builtin-method extend |

‎python/ql/test/2/library-tests/classes/mro/C3.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
| class C | [C, BaseException, object] |
44
| class D | [D, X, object] |
55
| class Meta | [Meta, type, object] |
6-
| class N | [N, object, O] |
76
| class NewStyle | [NewStyle, object] |
87
| class NewStyleDerived | [NewStyleDerived, NewStyle, object] |
98
| class O | [O] |

‎python/ql/test/2/library-tests/classes/mro/mro.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
| class D | class X | builtin-class object |
99
| class Meta | builtin-class type | builtin-class object |
1010
| class Meta | class Meta | builtin-class type |
11-
| class N | builtin-class object | class O |
12-
| class N | class N | builtin-class object |
1311
| class NewStyle | class NewStyle | builtin-class object |
1412
| class NewStyleDerived | class NewStyle | builtin-class object |
1513
| class NewStyleDerived | class NewStyleDerived | class NewStyle |

‎python/ql/test/2/library-tests/six/test.expected‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
| Module six | BytesIO | class StringIO |
22
| Module six | Iterator | class Iterator |
3+
| Module six | MAXSIZE | int() |
34
| Module six | PY2 | bool True |
45
| Module six | PY3 | bool False |
56
| Module six | StringIO | class StringIO |
@@ -45,14 +46,6 @@
4546
| Module six | iterlists | Function iterlists |
4647
| Module six | itervalues | Function itervalues |
4748
| Module six | moves | Module six.moves |
48-
| Module six | moves.__init__ | Module six.moves.__init__ |
49-
| Module six | moves.urllib | Module six.moves.urllib |
50-
| Module six | moves.urllib.__init__ | Module six.moves.urllib.__init__ |
51-
| Module six | moves.urllib_error | Module six.moves.urllib_error |
52-
| Module six | moves.urllib_parse | Module six.moves.urllib_parse |
53-
| Module six | moves.urllib_request | Module six.moves.urllib_request |
54-
| Module six | moves.urllib_response | Module six.moves.urllib_response |
55-
| Module six | moves.urllib_robotparser | Module six.moves.urllib_robotparser |
5649
| Module six | next | Builtin-function next |
5750
| Module six | operator | Module operator |
5851
| Module six | print_ | Function print_ |
@@ -67,6 +60,7 @@
6760
| Module six | with_metaclass | Function with_metaclass |
6861
| Module six.__init__ | BytesIO | class StringIO |
6962
| Module six.__init__ | Iterator | class Iterator |
63+
| Module six.__init__ | MAXSIZE | int() |
7064
| Module six.__init__ | PY2 | bool True |
7165
| Module six.__init__ | PY3 | bool False |
7266
| Module six.__init__ | StringIO | class StringIO |
@@ -174,7 +168,6 @@
174168
| Module six.moves | tkinter_tksimpledialog | Module tkSimpleDialog |
175169
| Module six.moves | tkinter_ttk | Module ttk |
176170
| Module six.moves | urllib | Module six.moves.urllib |
177-
| Module six.moves | urllib.__init__ | Module six.moves.urllib.__init__ |
178171
| Module six.moves | urllib_error | Module six.moves.urllib_error |
179172
| Module six.moves | urllib_parse | Module six.moves.urllib_parse |
180173
| Module six.moves | urllib_request | Module six.moves.urllib_request |

‎python/ql/test/2/library-tests/types/classes/mro_test.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
| class A | [A, ??, object] |
2+
| class J | [J, ??, object] |
13
| class MyDict | [MyDict, dict, object] |
24
| class MyList | [MyList, list, object] |
35
| class O1 | [O1] |

‎python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| equals_hash.py:8:5:8:28 | Function __eq__ | Class $@ implements __eq__ but does not define __hash__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
2-
| equals_hash.py:24:5:24:23 | Function __hash__ | Class $@ implements __hash__ but does not define __eq__ or __cmp__. | equals_hash.py:19:1:19:19 | class Hash | Hash |
1+
| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not define __hash__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
2+
| equals_hash.py:24:5:24:23 | Function Hash.__hash__ | Class $@ implements __hash__ but does not define __eq__ or __cmp__. | equals_hash.py:19:1:19:19 | class Hash | Hash |

‎python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| equals_hash.py:8:5:8:28 | Function __eq__ | Class $@ implements __eq__ but does not implement __ne__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
2-
| equals_hash.py:16:5:16:28 | Function __ne__ | Class $@ implements __ne__ but does not implement __eq__. | equals_hash.py:11:1:11:17 | class Ne | Ne |
1+
| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not implement __ne__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
2+
| equals_hash.py:16:5:16:28 | Function Ne.__ne__ | Class $@ implements __ne__ but does not implement __eq__. | equals_hash.py:11:1:11:17 | class Ne | Ne |

0 commit comments

Comments
 (0)