diff options
| author | Brian Dolbec <brian.dolbec@gmail.com> | 2011-02-23 22:38:03 -0800 |
|---|---|---|
| committer | Brian Dolbec <brian.dolbec@gmail.com> | 2011-03-26 19:39:13 -0700 |
| commit | bc8019e52ba29b30b528d31aa46180576e7d9dcb (patch) | |
| tree | a68e064a8f24bdcc2a6050cf61a6de13c8aea6b0 | |
| parent | f0f43429d260c9afa4bdda394e86a9b258e29150 (diff) | |
| download | layman-bc8019e52ba29b30b528d31aa46180576e7d9dcb.tar.gz layman-bc8019e52ba29b30b528d31aa46180576e7d9dcb.tar.bz2 layman-bc8019e52ba29b30b528d31aa46180576e7d9dcb.zip | |
clean out excessive use of try: except pairs
| -rw-r--r-- | layman/dbbase.py | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/layman/dbbase.py b/layman/dbbase.py index 53c2946..7b0a26a 100644 --- a/layman/dbbase.py +++ b/layman/dbbase.py @@ -94,10 +94,7 @@ class DbBase: if not os.path.exists(path): continue - try: - self.read_file(path) - except Exception, error: - if not ignore_init_read_errors: raise error + self.read_file(path) def __eq__(self, other): @@ -118,8 +115,10 @@ class DbBase: document = open(path, 'r').read() except Exception, error: - raise IOError('Failed to read the overlay list at ("' - + path + '")!\nError was:\n' + str(error)) + if not ignore_init_read_errors: + self.output.error('Failed to read the overlay list at ("' + + path + '")') + raise error self.read(document, origin=path) @@ -153,15 +152,9 @@ class DbBase: for overlay in overlays: self.output.debug('Parsing overlay entry', 8) - try: - ovl = Overlay(config=self.config, xml=overlay, + ovl = Overlay(config=self.config, xml=overlay, ignore=self.ignore, quiet=self.quiet) - except Exception, error: - raise error - self.output.warn("DbBase(); Error creating overlay instance", 3) - self.output.warn("Original error was: " + str(error), 3) - else: - self.overlays[ovl.name] = ovl + self.overlays[ovl.name] = ovl return @@ -186,13 +179,9 @@ class DbBase: self.output.info("DbBase: add_from_dict()") for overlay in overlays: self.output.debug('Parsing overlay entry', 8) - try: - ovl = Overlay(self.config, ovl_dict=overlay, + ovl = Overlay(self.config, ovl_dict=overlay, ignore=self.ignore, quiet=self.quiet) - except Exception, error: - self.output.warn(str(error), 3) - else: - self.overlays[ovl.name] = ovl + self.overlays[ovl.name] = ovl return |