Add throw error on norm value for fft routines

Author: jeanlaroche

pythran/pythonic/numpy/fft/irfft.hpp

@@ -88,7 +88,13 @@ namespace numpy
 
       // These functions help handle None inputs for default values without relying on the C++ default mechanism.
       bool testNorm(types::none_type param) { return false; }
-      bool testNorm(types::str param) { return param == "ortho"; }
+      bool testNorm(types::str param) {
+        if (param == "ortho") return 1;
+        else {
+            throw types::ValueError("norm should be None or \"ortho\"");
+            return 0;
+        }
+      }
 
       long testLong(types::none_type param, long def_val) { return def_val;}
       long testLong(long N, long def_val) { return N;}
@@ -106,10 +112,10 @@ namespace numpy
         if (axis >= LN) throw types::ValueError("axis out of bounds1");
         if (axis <= -LN-1) throw types::ValueError("axis out of bounds");
         // Handle None for NFFT. Map -1 -> N-1 etc...
-        long idx = (axis+N)%N;
-        long def_val = 2*(sutils::array(in_array.shape())[idx] - 1);
+        axis = (axis+N)%N;
+        long def_val = 2*(sutils::array(in_array.shape())[axis] - 1);
         long NFFT = testLong(_NFFT,def_val);
-        if (axis != -1 && axis != N - 1) {
+        if (axis != N - 1) {
             // Swap axis if the FFT must be computed on an axis that's not the last
             // one.
             auto swapped_array = swapaxes(in_array, axis, N - 1);

pythran/pythonic/numpy/fft/rfft.hpp

@@ -92,7 +92,13 @@ namespace numpy
 
     // These functions help handle None inputs for default values without relying on the C++ default mechanism.
     bool testNorm(types::none_type param) { return false; }
-    bool testNorm(types::str param) { return param == "ortho"; }
+    bool testNorm(types::str param) {
+        if (param == "ortho") return 1;
+        else {
+            throw types::ValueError("norm should be None or \"ortho\"");
+            return 0;
+        }
+    }
 
     long testLong(types::none_type param, long def_val) { return def_val;}
     long testLong(long N, long def_val) { return N;}