# HG changeset patch
# User Pascal Lamblin <lamblinp@iro.umontreal.ca>
# Date 1256589196 14400
# Node ID ab7d598f55795b6faa55f49a3f8b9ef75b97cf4a
# Parent  1bdfef116a61e141224507b47081692b81bc6a86# Parent  cfdaa56c66e804bb21241ce8c77f4c8577674b80
merge.

diff -r cfdaa56c66e8 -r ab7d598f5579 pylearn/dataset_ops/cifar10.py
--- a/pylearn/dataset_ops/cifar10.py	Mon Oct 26 15:35:38 2009 -0400
+++ b/pylearn/dataset_ops/cifar10.py	Mon Oct 26 16:33:16 2009 -0400
@@ -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 cfdaa56c66e8 -r ab7d598f5579 pylearn/datasets/config.py
--- a/pylearn/datasets/config.py	Mon Oct 26 15:35:38 2009 -0400
+++ b/pylearn/datasets/config.py	Mon Oct 26 16:33:16 2009 -0400
@@ -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():