Don't specify curve or data block types. See doc/standards.txt.

[hooke.git] / hooke / driver / tutorial.py

diff --git a/hooke/driver/tutorial.py b/hooke/driver/tutorial.py
index adcaf2cec1529d7b87d6f3d1cda3338325c19e47..abd2dae39d793d73767ffc390175c08efcbc1acc 100644 (file)
--- a/hooke/driver/tutorial.py
+++ b/hooke/driver/tutorial.py
@@ -2,15 +2,15 @@
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-# Hooke is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with Hooke.  If not, see
@@ -61,10 +61,11 @@ file format is as following::
 that is, two plots with two datasets each.
 """
 
+import os.path
+
 # The following are relative imports.  See PEP 328 for details
 #   http://www.python.org/dev/peps/pep-0328/
 from .. import curve as curve # this module defines data containers.
-from .. import experiment as experiment # this module defines expt. types
 from ..config import Setting # configurable setting class
 from . import Driver as Driver # this is the Driver base class
 
@@ -105,6 +106,8 @@ class TutorialDriver (Driver):
         Hooke to understand what kind of files we're looking at
         automatically.
         """
+        if os.path.isdir(path):
+            return False
 
         f = open(path, 'r')
         header = f.readline() # we only need the first line
@@ -120,7 +123,7 @@ class TutorialDriver (Driver):
             return True
         return False
 
-    def read(self, path):
+    def read(self, path, info=None):
         f = open(path,'r') # open the file for reading
         """In this case, we have a data format that is just a list of
         ASCII values, so we can just divide that in rows, and generate
@@ -132,5 +135,5 @@ class TutorialDriver (Driver):
         f.close() # remember to close the file
 
         data = curve.Data()
-        info = {'filetype':'tutorial', 'experiment':experiment.Experiment}
+        info = {}
         return (data, info)