diff options
| author | Sascha Silbe <sascha@silbe.org> | 2009-08-17 12:30:17 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha@silbe.org> | 2009-08-17 12:30:17 (GMT) |
| commit | 1d792082996e18ea6adcfd618654fdbf7b3b9d56 (patch) | |
| tree | 9eeafdef107c4feb8d34c78ea9adedf87226c455 | |
| parent | 1bf549ef2904e1161d705280292e402ab5f0538c (diff) | |
fix bugs found by pylint
| -rw-r--r-- | src/carquinyol/datastore.py | 8 | ||||
| -rw-r--r-- | src/carquinyol/migration.py | 2 | ||||
| -rw-r--r-- | src/carquinyol/optimizer.py | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py index 4920475..8e5c796 100644 --- a/src/carquinyol/datastore.py +++ b/src/carquinyol/datastore.py @@ -239,7 +239,7 @@ class DataStore(dbus.service.Object): if not layoutmanager.get_instance().index_updated: logging.warning('Index updating, returning all entries') - return self._find_all(query, properties) + return self._find_all(query, options) entries = [] for (tree_id, version_id) in tvids: @@ -255,17 +255,17 @@ class DataStore(dbus.service.Object): self._index_store.open_index() self._rebuild_index() - return self._find_all(query, properties) + return self._find_all(query, options) metadata = self._metadata_store.retrieve(tree_id, version_id, - properties) + options.get('metadata')) entries.append(metadata) LOGGER.debug('find(): %r' % (time.time() - t)) return entries, count - def _find_all(self, query, properties): + def _find_all(self, query, options): tvids = layoutmanager.get_instance().find_all() if not options.get('all_versions', False): # only return latest version for each entry diff --git a/src/carquinyol/migration.py b/src/carquinyol/migration.py index 5649875..87b7d60 100644 --- a/src/carquinyol/migration.py +++ b/src/carquinyol/migration.py @@ -90,7 +90,7 @@ def _migrate_metadata_0(root_path, old_root_path, tree_id, version_id): try: _MSTORE.store(tree_id, version_id, metadata) - except: + except Exception: logging.error( 'Error while migrating property entry %s: %s\n' % \ (tree_id, traceback.format_exc())) diff --git a/src/carquinyol/optimizer.py b/src/carquinyol/optimizer.py index b30c568..616afaf 100644 --- a/src/carquinyol/optimizer.py +++ b/src/carquinyol/optimizer.py @@ -18,7 +18,6 @@ import os import errno import logging import subprocess -import uuid import gobject |