Mercurial > hg > audiodb
changeset 630:5f47b734c532
Various fixes:
* queryConfig -> configQuery throughout
* instance check fix
* True response from configCheck
author | mas01mj |
---|---|
date | Wed, 23 Sep 2009 16:19:42 +0000 |
parents | e2af7d01c7a8 |
children | 6ec50185b348 |
files | bindings/python/pyadb.py |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/bindings/python/pyadb.py Wed Sep 23 15:25:35 2009 +0000 +++ b/bindings/python/pyadb.py Wed Sep 23 16:19:42 2009 +0000 @@ -103,14 +103,14 @@ durRatio : double time expansion/compresion ratio,\n\ hopSize : int hopsize (1 by default)])->resultDict\n\ resFmt : [\"list\"|\"dict\"](\"dict\" by default)}""" - for key in self.queryConfig.keys(): + for key in self.configQuery.keys(): if key not in Pyadb.validConfigTerms.keys(): - if not scrub:return False - del self.queryConfig[key] - if not isinstance(Pyadb.validConfigTerms[key], self.queryConfig[key]): - if not scrub:return False - self.queryConfig[key] = Pyadb.validConfigTerms[key](self.queryConfig[key])#hrm, syntax? - + if not scrub: return False + del self.configQuery[key] + if not isinstance(self.configQuery[key], Pyadb.validConfigTerms[key]): + if not scrub: return False + self.configQuery[key] = Pyadb.validConfigTerms[key](self.configQuery[key])#hrm, syntax? + return True # @@ -130,7 +130,7 @@ result = _pyadb._pyadb_queryFromKey(self._db, key, **self.configQuery) elif featData: raise NotImplementedError("direct data query not yet implemented. Sorry.") - return Result(result, self.queryConfig) + return Pyadb.Result(result, self.configQuery) ###internal methods### def _updateDBAttributes(self): @@ -167,4 +167,4 @@ if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main()