From fdd1a33420ee28a813ca15aa601a011eb4c21750 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Fri, 2 Sep 2016 10:59:58 -0600
Subject: [PATCH] Updated name of load_function to be read_original_data (to be
consistent with the name of the function); used BioFile.load instead of
bob.db.base.File.load as default.
---
bob/bio/base/preprocessor/Filename.py | 4 ++--
bob/bio/base/preprocessor/Preprocessor.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bob/bio/base/preprocessor/Filename.py b/bob/bio/base/preprocessor/Filename.py
index a78af095..2b6c6d04 100644
--- a/bob/bio/base/preprocessor/Filename.py
+++ b/bob/bio/base/preprocessor/Filename.py
@@ -14,8 +14,8 @@ class Filename (Preprocessor):
"""
def __init__(self):
- # call base class constructor, using a custom ``load_function`` that does nothing and always returns None
- Preprocessor.__init__(self, writes_data=False, load_function = lambda x,y,z: None)
+ # call base class constructor, using a custom ``read_original_data`` that does nothing and always returns None
+ Preprocessor.__init__(self, writes_data=False, read_original_data = lambda x,y,z: None)
# The call function (i.e. the operator() in C++ terms)
diff --git a/bob/bio/base/preprocessor/Preprocessor.py b/bob/bio/base/preprocessor/Preprocessor.py
index 3534cdde..a5b24e28 100644
--- a/bob/bio/base/preprocessor/Preprocessor.py
+++ b/bob/bio/base/preprocessor/Preprocessor.py
@@ -4,7 +4,7 @@
# @date: Tue Oct 2 12:12:39 CEST 2012
import bob.io.base
-import bob.db.base
+import bob.bio.db
import os
@@ -27,11 +27,11 @@ class Preprocessor:
A list of keyword arguments to be written in the :py:meth:`__str__` function.
"""
- def __init__(self, writes_data = True, load_function = bob.db.base.File.load, **kwargs):
+ def __init__(self, writes_data = True, read_original_data = bob.bio.db.BioFile.load, **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
- self.read_original_data = load_function
+ self.read_original_data = read_original_data
self._kwargs = kwargs
pass
--
GitLab