Merge remote-tracking branch 'origin/master'

This commit is contained in:
Konstantin Bulenkov
2014-02-13 23:22:02 +01:00
@@ -952,17 +952,6 @@ public class PyUtil {
while (value instanceof PyParenthesizedExpression) {
value = ((PyParenthesizedExpression)value).getContainedExpression();
}
if (value instanceof PyReferenceExpression) {
PyReferenceExpression refExpr = (PyReferenceExpression)value;
PsiElement deref = refExpr.getReference().resolve();
if (deref instanceof PyTargetExpression) {
PyTargetExpression te = (PyTargetExpression)deref;
PyExpression assignedValue = te.findAssignedValue();
if (assignedValue instanceof PySequenceExpression) {
value = assignedValue;
}
}
}
if (value instanceof PySequenceExpression) {
final PyExpression[] elements = ((PySequenceExpression)value).getElements();
List<String> result = new ArrayList<String>(elements.length);