Merge branch 'issue-8-remove-database-configuration' of...

Merge branch 'issue-8-remove-database-configuration' of gitlab.idiap.ch:bob/bob.bio.base into issue-8-remove-database-configuration

bob/bio/base/preprocessor/Preprocessor.py

@@ -22,7 +22,7 @@ class Preprocessor:
     A list of keyword arguments to be written in the :py:meth:`__str__` function.
   """
 
-  def __init__(self, writes_data = True, read_original_data = lambda biofile,directory,extension : biofile.load(directory,extension), **kwargs):
+  def __init__(self, writes_data = True, read_original_data = utils.read_original_data, **kwargs):
     # Each class needs to have a constructor taking
     # all the parameters that are required for the preprocessing as arguments
     self.writes_data = writes_data

bob/bio/base/utils/io.py

@@ -4,6 +4,7 @@ import tempfile, tarfile
 import logging
 logger = logging.getLogger("bob.bio.base")
 
+from .. import database
 import bob.io.base
 
 def filter_missing_files(file_names, split_by_client=False, allow_missing_files=True):
@@ -51,6 +52,33 @@ def check_file(filename, force, expected_file_size = 1):
   return False
 
 
+def read_original_data(biofile, directory, extension):
+  """read_original_data(biofile, directory, extension) -> data
+
+  This function reads the original data using the given ``biofile`` instance.
+  It simply calls ``load(directory, extension)`` from :py:class:`bob.bio.base.database.BioFile` or one of its derivatives.
+
+  **Parameters:**
+
+  ``biofile`` : :py:class:`bob.bio.base.database.BioFile` or one of its derivatives
+    The file to read the original data.
+
+  ``directory`` : str
+    The base directory of the database.
+
+  ``extension`` : str or ``None``
+    The extension of the original data.
+    Might be ``None`` if the ``biofile`` itself has the extension stored.
+
+  **Returns**
+
+  ``data`` : object
+    Whatver ``biofile.load`` returns; usually a :py:class:`numpy.ndarray`
+  """
+  assert isinstance(biofile, database.BioFile)
+  return biofile.load(directory, extension)
+
+
 def load(file):
   """Loads data from file. The given file might be an HDF5 file open for reading or a string."""
   if isinstance(file, bob.io.base.HDF5File):