Skip to content

Commit

Permalink
Merge pull request #248 from chinapnr/miaotianshi_20191022
Browse files Browse the repository at this point in the history
2019.10.22 v1.1.16 fix a PEP8 warning and a typo
  • Loading branch information
itaa committed Oct 22, 2019
2 parents 0f72d68 + 805a160 commit 53cdf53
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fishbase/fish_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def conf_as_dict(conf_filename, encoding=None, case_sensitive=False):
cf.read(conf_filename, encoding=encoding)
else:
cf.read(conf_filename)
except:
except Exception:
flag = False
return flag,

Expand Down Expand Up @@ -1145,8 +1145,8 @@ def yaml_conf_as_dict(file_path, encoding=None):
with open(file_path, 'r') as f:
d = OrderedDict(yaml.load(f.read()))
return True, d, 'Success'
except:
return False, {}, 'Unknow error'
except Exception:
return False, {}, 'Unknown error'


# 2019.01.06 edit by Hu Jun, #152
Expand Down

0 comments on commit 53cdf53

Please sign in to comment.