diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
| commit | db4a3b0426f4912639c142366ff27594d54ce360 (patch) | |
| tree | fe258d4b663b9607230e456cfa25cdfe29cb3a70 /src/lib/Bcfg2/Server/Plugins/Pkgmgr.py | |
| parent | ed9920711a6020fa01d564db34e0ee4800718cc6 (diff) | |
| parent | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (diff) | |
| download | bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.gz bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.bz2 bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.zip | |
Merge pull request #250 from stpierre/blanket-except-plugins-lint
Remove blanket excepts from plugins and lint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Pkgmgr.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Pkgmgr.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py index c7d8986ed..7c6ab0ed7 100644 --- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py +++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py @@ -35,7 +35,7 @@ class FuzzyDict(dict): def get(self, key, default=None): try: return self.__getitem__(key) - except: + except KeyError: if default: return default raise @@ -182,11 +182,7 @@ class PNode(object): """Return a dictionary of package mappings.""" if self.predicate(metadata, entry): for key in self.contents: - try: - data[key].update(self.contents[key]) - except: # pylint: disable=W0702 - data[key] = FuzzyDict() - data[key].update(self.contents[key]) + data.setdefault(key, FuzzyDict).update(self.contents[key]) for child in self.children: child.Match(metadata, data) |