Make right par indent=none in import statement (PY-9075).

python/src/com/jetbrains/python/formatter/PyBlock.java

@@ -213,13 +213,17 @@ public class PyBlock implements ASTBlock {
       }
     }
     else if (parentType == PyElementTypes.FROM_IMPORT_STATEMENT) {
-      if ((childType == PyElementTypes.IMPORT_ELEMENT || childType == PyTokenTypes.RPAR) &&
-          _node.findChildByType(PyTokenTypes.LPAR) != null) {
-        if (myContext.getPySettings().ALIGN_MULTILINE_IMPORTS) {
-          childAlignment = getAlignmentForChildren();
+      if (_node.findChildByType(PyTokenTypes.LPAR) != null) {
+        if (childType == PyElementTypes.IMPORT_ELEMENT) {
+          if (myContext.getPySettings().ALIGN_MULTILINE_IMPORTS) {
+            childAlignment = getAlignmentForChildren();
+          }
+          else {
+            childIndent = Indent.getNormalIndent();
+          }
         }
-        else {
-          childIndent = Indent.getNormalIndent();
+        if (childType == PyTokenTypes.RPAR) {
+          childIndent = Indent.getNoneIndent();
         }
       }
     }

python/testData/formatter/indentParensInImport.py

@@ -0,0 +1,3 @@
+from some.module import (
+    thing
+    )

python/testData/formatter/indentParensInImport_after.py

@@ -0,0 +1,3 @@
+from some.module import (
+    thing
+)

python/testSrc/com/jetbrains/python/PyFormatterTest.java

@@ -366,6 +366,10 @@ public class PyFormatterTest extends PyTestCase {
     doTest();
   }
 
+  public void testIndentParensInImport() { // PY-9075
+    doTest();
+  }
+
   private void doTest() {
     doTest(false);
   }