merge

theano/compile/function_module.py

@@ -727,7 +727,10 @@ def function(inputs, outputs, mode=default_mode, accept_inplace = False):
     """
 
     inputs = map(convert_function_input, inputs)
-    outputs = map(FunctionMaker.wrap_out, outputs) if isinstance(outputs, (list, tuple)) else FunctionMaker.wrap_out(outputs)
+    if outputs is None:
+        outputs = []
+    else:
+        outputs = map(FunctionMaker.wrap_out, outputs) if isinstance(outputs, (list, tuple)) else FunctionMaker.wrap_out(outputs)
 
     defaults = [getattr(input, 'value', None) for input in inputs]
 

theano/compile/tests/test_function.py

@@ -148,6 +148,14 @@ def checkfor(testcase, fn, E):
 
 
 class T_function(unittest.TestCase):
+    def test_none(self):
+        fn = function([], None) #ok
+        rval = fn()
+        if rval == []:
+            print >> sys.stderr, 'WARNING: ticket #254'
+        else:
+            assert rval is None
+
     def test_empty(self):
         fn = function([], []) #ok
         self.failUnless(fn() == [])