# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1257279985 18000
# Node ID 22e3a422653d0510dea1dc660c79b81e6ae0afda
# Parent  e6d2cb4937544d3fb954fa35a6a5488ae17f68c6# Parent  ab7d598f55795b6faa55f49a3f8b9ef75b97cf4a
merge

diff -r e6d2cb493754 -r 22e3a422653d pylearn/dataset_ops/cifar10.py
--- a/pylearn/dataset_ops/cifar10.py	Tue Nov 03 15:26:07 2009 -0500
+++ b/pylearn/dataset_ops/cifar10.py	Tue Nov 03 15:26:25 2009 -0500
@@ -88,7 +88,7 @@
     x_fn, y_fn = split_options[split]
 
     x_op = TensorFnDataset(dtype, (False,), (x_fn, (dtype,)), (3072,))
-    y_op = TensorFnDataset(dtype, (), y_fn)
+    y_op = TensorFnDataset('int32', (), y_fn)
 
     x = x_op(s_idx)
     y = y_op(s_idx)
diff -r e6d2cb493754 -r 22e3a422653d pylearn/datasets/config.py
--- a/pylearn/datasets/config.py	Tue Nov 03 15:26:07 2009 -0500
+++ b/pylearn/datasets/config.py	Tue Nov 03 15:26:25 2009 -0500
@@ -22,7 +22,7 @@
             env_get.first_warning = False
         return default
     else:
-        os.getenv(key)
+        return os.getenv(key)
 env_get.first_warning = True
 
 def data_root():