Import at end of Python modules to get recursive factorial working

2 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
index 75b9350..9131fb2 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
@@ -92,9 +92,9 @@ public class PythonCodeGenerator {
             ImmutableList.copyOf(Iterables.concat(asList(constructor), pythonMethods)));
         
         return pythonModule(ImmutableList.copyOf(Iterators.concat(
+            singletonIterator(pythonClass),
             imports,
-            singletonIterator(internalsImport),
-            singletonIterator(pythonClass))));
+            singletonIterator(internalsImport))));
     }
     
     private static Stream<PythonImportNode> generateImports(ClassNode classNode) {
diff --git a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
index e5d810e..c6471c9 100644
--- a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java
@@ -8,7 +8,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.zwobble.couscous.CouscousCompiler;
 import org.zwobble.couscous.ast.ClassNode;
@@ -50,10 +49,9 @@ public class JavaToPythonTests {
     }
     
     @Test
-    @Ignore
     public void recursiveFactorial() throws Exception {
         assertEquals(
-            value(120),
+            value(720),
             execProgram(
                 "recursive-factorial",
                 TypeName.of("com.example.RecursiveFactorial"),