From 9eb1e90cf60df575e9d49e7118cfdb38daaef6ba Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 13 Sep 2016 21:58:45 +0200
Subject: [PATCH] Fix use of read_config_file() at other points
---
bob/bio/base/script/grid_search.py | 2 +-
bob/bio/base/utils/resources.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bob/bio/base/script/grid_search.py b/bob/bio/base/script/grid_search.py
index ea2dc5e8..d04b2b70 100755
--- a/bob/bio/base/script/grid_search.py
+++ b/bob/bio/base/script/grid_search.py
@@ -406,7 +406,7 @@ def main(command_line_parameters = None):
command_line_options(command_line_parameters)
global configuration, place_holder_key
- configuration = utils.read_config_file(args.configuration_file)
+ configuration = utils.read_config_file([args.configuration_file])
place_holder_key = args.place_holder_key
if args.preprocessor:
diff --git a/bob/bio/base/utils/resources.py b/bob/bio/base/utils/resources.py
index 12fe0acb..62463007 100644
--- a/bob/bio/base/utils/resources.py
+++ b/bob/bio/base/utils/resources.py
@@ -47,7 +47,7 @@ def _collect_config(paths):
def _attach_resources(src, dst):
for k in dir(src):
- dst.__dict__[k] = getattr(src, k)
+ setattr(dst, k, getattr(src, k))
import random
@@ -170,7 +170,7 @@ def load_resource(resource, keyword, imports = ['bob.bio.base'], package_prefix=
# first, look if the resource is a file name
if os.path.isfile(resource):
- return read_config_file(resource, keyword)
+ return read_config_file([resource], keyword)
if keyword not in valid_keywords:
raise ValueError("The given keyword '%s' is not valid. Please use one of %s!" % (str(keyword), str(valid_keywords)))
--
GitLab