Merge branch 'master' of git.labs.intellij.net:idea/ultimate

python/src/com/jetbrains/python/psi/PyUtil.java

@@ -108,7 +108,8 @@ public class PyUtil {
     return ArrayUtil.toObjectArray(result, aClass);
   }
 
-  public static PyExpression flattenParens(PyExpression expr) {
+  @Nullable
+  public static PyExpression flattenParens(@Nullable PyExpression expr) {
     while (expr instanceof PyParenthesizedExpression) {
       expr = ((PyParenthesizedExpression) expr).getContainedExpression();
     }

python/testData/console/indent3.after.py

@@ -1,5 +1,4 @@
 for i in range(1, 10):
     print i
-
 for i in range(1, 10):
     print i

python/testData/console/indent4.after.py

@@ -1,5 +1,4 @@
 print 1
-
 for j in range(0, 2):
     for i in range(1, 10):
         print i