VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Operator fixes. Subclass of Simple, now.

Browse Source
This commit is contained in:
Dave Halter
2014-07-22 16:02:34 +02:00
parent 15f42d93d7
commit 852cdad754
5 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/precedence.py
+3 -3
View File
@@ -123,8 +123,8 @@ class MergedOperator(pr.Operator):
"""
def __init__(self, first, second):
string = first.string + ' ' + second.string
super(MergedOperator, self).__init__(string, first.start_pos)
super(MergedOperator, self).__init__(first._sub_module, string,
first.parent, first.start_pos)
self.first = first
self.second = second
@@ -278,7 +278,7 @@ def _element_calculate(evaluator, left, operator, right):
# Static analysis, one is a number, the other one is not.
elif l_is_num != r_is_num:
message = "TypeError: unsupported operand type(s) for +: %s and %s"
analysis.add(evaluator, 'type-error-operation', right,
analysis.add(evaluator, 'type-error-operation', operator,
message % (left, right))
elif operator == '-':
if _is_number(left) and _is_number(right):