Rename protos to protocols

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

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')")

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')")

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)