diff --git a/bob/bio/face/script/display_face_annotations.py b/bob/bio/face/script/display_face_annotations.py index 3149a99b581a9570ad73f826c4c6def9106e59fa..b0202f6311b7b48161d4636a4b86a9d0aa030491 100644 --- a/bob/bio/face/script/display_face_annotations.py +++ b/bob/bio/face/script/display_face_annotations.py @@ -31,7 +31,7 @@ def command_line_arguments(command_line_parameters): parser.add_argument('-f', '--file-ids', nargs = '+', help = 'If given, only the images of the --database with the given file id are shown (non-existing IDs will be silently skipped).') parser.add_argument('-a', '--annotation-directory', help = 'If given, use the annotations stored in the given annotation directory (this might be required for some databases).') parser.add_argument('-x', '--annotation-file-extension', default = '.pos', help = 'Annotation files have the given filename extension.') - parser.add_argument('-t', '--annotation-file-type', default = 'named', help = 'Select the annotation file style, see bob.db.verification.utils documentation for valid types.') + parser.add_argument('-t', '--annotation-file-type', default = 'named', help = 'Select the annotation file style, see bob.db.base documentation for valid types.') parser.add_argument('-n', '--annotate-names', action = 'store_true', help = 'Plot the names of the annotations, too.') parser.add_argument('-m', '--marker-style', default='rx', help = 'Select the marker style') parser.add_argument('-M', '--marker-size', type=float, default=10., help = 'Select the marker size') @@ -84,7 +84,7 @@ def main(command_line_parameters=None): annotation_file = f.make_path(args.annotation_directory, args.annotation_file_extension) if os.path.exists(annotation_file): logger.info("Loading annotations from file %s", annotation_file) - annotations = bob.db.verification.utils.read_annotation_file(annotation_file, args.annotation_file_type) + annotations = bob.db.base.read_annotation_file(annotation_file, args.annotation_file_type) else: logger.warn("Could not find annotation file %s", annotation_file) else: diff --git a/bob/bio/face/test/test_preprocessors.py b/bob/bio/face/test/test_preprocessors.py index 7dcb0d5b25afbf6b5b1eecbc31baf46266abeb02..4da0608966feea2282a09a1086e9c19283dfa19c 100644 --- a/bob/bio/face/test/test_preprocessors.py +++ b/bob/bio/face/test/test_preprocessors.py @@ -19,18 +19,15 @@ import unittest -import os import numpy -from nose.plugins.skip import SkipTest - import pkg_resources regenerate_refs = False import bob.bio.base import bob.bio.face -import bob.db.verification.utils +import bob.db.base def _compare(data, reference, write_function = bob.bio.base.save, read_function = bob.bio.base.load, atol = 1e-5, rtol = 1e-8): @@ -48,7 +45,7 @@ def _image(): return bob.io.base.load(pkg_resources.resource_filename('bob.bio.face.test', 'data/testimage.jpg')) def _annotation(): - return bob.db.verification.utils.read_annotation_file(pkg_resources.resource_filename('bob.bio.face.test', 'data/testimage.pos'), 'named') + return bob.db.base.read_annotation_file(pkg_resources.resource_filename('bob.bio.face.test', 'data/testimage.pos'), 'named') def test_base():