GR-26037: execute IMPORT_NAME before IMPORT_FROM

- style fixes

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PConstructAndRaiseNode.java

@@ -109,19 +109,19 @@ PException constructAndRaiseNoFormatString(VirtualFrame frame, PythonBuiltinClas
         return raiseInternal(frame, type, arguments, keywords, callNode, language, core);
     }
 
-    @Specialization(guards = {"arguments == null"})
+    @Specialization(guards = {"format != null", "arguments == null"})
     PException constructAndRaiseNoArgs(VirtualFrame frame, PythonBuiltinClassType type, String format, Object[] formatArgs,
                     @SuppressWarnings("unused") Object[] arguments, PKeyword[] keywords,
                     @Cached.Shared("callNode") @Cached CallVarargsMethodNode callNode,
                     @Cached.Shared("pol") @CachedLibrary(limit = "3") PythonObjectLibrary pol,
                     @CachedLanguage PythonLanguage language,
                     @CachedContext(PythonLanguage.class) PythonContext context) {
         PythonCore core = context.getCore();
-        Object[] args = new Object[]{getFormattedMessage(pol, format, formatArgs)};
+        Object[] args = new Object[]{formatArgs != null ? getFormattedMessage(pol, format, formatArgs) : format};
         return raiseInternal(frame, type, args, keywords, callNode, language, core);
     }
 
-    @Specialization(guards = {"arguments != null"})
+    @Specialization(guards = {"format != null", "arguments != null"})
     PException constructAndRaise(VirtualFrame frame, PythonBuiltinClassType type, String format, Object[] formatArgs,
                     Object[] arguments, PKeyword[] keywords,
                     @Cached.Shared("callNode") @Cached CallVarargsMethodNode callNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FactorySSTVisitor.java

@@ -995,7 +995,8 @@ public PNode visit(ImportSSTNode node) {
                 }
 
                 WriteNode readNode = (WriteNode) scopeEnvironment.findVariable(node.asName).makeWriteNode(EmptyNode.create());
-                result = nodeFactory.createImportFrom(from, new String[]{parts[parts.length - 1]}, new WriteNode[]{readNode}, level);
+                StatementNode importFrom = nodeFactory.createImportFrom(from, new String[]{parts[parts.length - 1]}, new WriteNode[]{readNode}, level);
+                result = nodeFactory.createBlock(importNode.asStatement(), importFrom);
             } else {
                 result = scopeEnvironment.findVariable(node.asName).makeWriteNode(importNode);
             }