# HG changeset patch
# User Xavier Glorot <glorotxa@iro.umontreal.ca>
# Date 1255529977 14400
# Node ID 0ba62c55d59f2d1a916b0eff49bae01a88ee5814
# Parent  0f66973e4f95c8f86618787cc4ad39c10079ab46# Parent  3f44379177b26c89c6cab31ffbfe657ba13d2283
merge

diff -r 0f66973e4f95 -r 0ba62c55d59f pylearn/datasets/MNIST.py
--- a/pylearn/datasets/MNIST.py	Wed Oct 14 10:19:14 2009 -0400
+++ b/pylearn/datasets/MNIST.py	Wed Oct 14 10:19:37 2009 -0400
@@ -53,11 +53,11 @@
 def full():
     return train_valid_test()
 
-#usefull for test, keep it
+#useful for test, keep it
 def first_10():
     return train_valid_test(ntrain=10, nvalid=10, ntest=10)
 
-#usefull for test, keep it
+#useful for test, keep it
 def first_100():
     return train_valid_test(ntrain=100, nvalid=100, ntest=100)
 
diff -r 0f66973e4f95 -r 0ba62c55d59f pylearn/io/pmat.py
--- a/pylearn/io/pmat.py	Wed Oct 14 10:19:14 2009 -0400
+++ b/pylearn/io/pmat.py	Wed Oct 14 10:19:37 2009 -0400
@@ -36,7 +36,12 @@
 
 #import numarray, sys, os, os.path
 import numpy.numarray, sys, os, os.path
-import fpconst
+try:
+    import fpconst
+except ImportError:
+    print 'Python library fpconst is needed but not installed,'
+    print 'please install it using your favorite package manager.'
+    raise
 
 def array_columns( a, cols ):
     indices = None