From 7cc54328c584aec0943188d6357590ad24d36c9a Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 25 Sep 2012 21:13:06 +0200
Subject: [PATCH] Rename protos to protocols
---
buildout.cfg | 11 +++--------
xbob/db/replay/checkfiles.py | 2 +-
xbob/db/replay/dumplist.py | 2 +-
xbob/db/replay/query.py | 2 +-
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/buildout.cfg b/buildout.cfg
index 644346d..56113da 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -6,19 +6,14 @@
parts = external tests sphinx python
newest = false
develop = .
-versions = versions
eggs = bob
xbob.db.replay
-
-[versions]
-;If you would like to pin-down the recipes package version so you are not
-;bothered with eventual updates, do it here. Note that, by pinning the version
-;of the package, you will be also excluded from bug fixes.
-;xbob.buildout = 0.1
+;bob = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
+bob = /Users/andre/work/bob/b/release/i
[external]
recipe = xbob.buildout:external
-egg-directories = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release/lib
+egg-directories = ${buildout:bob}/lib
[tests]
recipe = xbob.buildout:nose
diff --git a/xbob/db/replay/checkfiles.py b/xbob/db/replay/checkfiles.py
index 9ab3027..f56f722 100644
--- a/xbob/db/replay/checkfiles.py
+++ b/xbob/db/replay/checkfiles.py
@@ -65,7 +65,7 @@ def add_command(subparsers):
protocols = ('waiting','for','database','creation')
clients = tuple()
else:
- protocols = [k.name for k in db.protos()]
+ protocols = [k.name for k in db.protocols()]
clients = [k.id for k in db.clients()]
parser.add_argument('-d', '--directory', dest="directory", default='', help="if given, this path will be prepended to every entry checked (defaults to '%(default)s')")
diff --git a/xbob/db/replay/dumplist.py b/xbob/db/replay/dumplist.py
index 85d9351..9f95dca 100644
--- a/xbob/db/replay/dumplist.py
+++ b/xbob/db/replay/dumplist.py
@@ -52,7 +52,7 @@ def add_command(subparsers):
protocols = ('waiting','for','database','creation')
clients = tuple()
else:
- protocols = [k.name for k in db.protos()]
+ protocols = [k.name for k in db.protocols()]
clients = [k.id for k in db.clients()]
parser.add_argument('-d', '--directory', dest="directory", default='', help="if given, this path will be prepended to every entry returned (defaults to '%(default)s')")
diff --git a/xbob/db/replay/query.py b/xbob/db/replay/query.py
index c13b1c3..61849eb 100644
--- a/xbob/db/replay/query.py
+++ b/xbob/db/replay/query.py
@@ -114,7 +114,7 @@ class Database(object):
# check protocol validity
if not protocol: protocol = 'grandtest' #default
- VALID_PROTOCOLS = [k.name for k in self.protos()]
+ VALID_PROTOCOLS = [k.name for k in self.protocols()]
if protocol not in VALID_PROTOCOLS:
raise RuntimeError, 'Invalid protocol "%s". Valid values are %s' % \
(protocol, VALID_PROTOCOLS)
--
GitLab