NotificationsYou must be signed in to change notification settings
Fork673
Star2.4k

Commit1471c82

committed

chore: remove broad Exception catching fromconfig.py

Change "except Exception:" catching to more granular exceptions.A step in enabling the "broad-except" check in pylint.

1 parent1136b17 commit1471c82Copy full SHA for 1471c82

File tree

1 file changed

+19

-25

lines changed

gitlab
- config.py

1 file changed

+19

-25

lines changed

`‎gitlab/config.py`

Lines changed: 19 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,108 +165,102 @@ def _parse_config(self) -> None:`
`165`	`165`	`# Value Error means the option exists but isn't a boolean.`
`166`	`166`	`# Get as a string instead as it should then be a local path to a`
`167`	`167`	`# CA bundle.`
`168`		`-try:`
`169`		`-self.ssl_verify=_config.get("global","ssl_verify")`
`170`		`-exceptException:# pragma: no cover`
`171`		`-pass`
`172`		`-exceptException:`
	`168`	`+self.ssl_verify=_config.get("global","ssl_verify")`
	`169`	`+except (configparser.NoOptionError,configparser.NoSectionError):`
`173`	`170`	`pass`
`174`	`171`	`try:`
`175`	`172`	`self.ssl_verify=_config.getboolean(self.gitlab_id,"ssl_verify")`
`176`	`173`	`exceptValueError:`
`177`	`174`	`# Value Error means the option exists but isn't a boolean.`
`178`	`175`	`# Get as a string instead as it should then be a local path to a`
`179`	`176`	`# CA bundle.`
`180`		`-try:`
`181`		`-self.ssl_verify=_config.get(self.gitlab_id,"ssl_verify")`
`182`		`-exceptException:# pragma: no cover`
`183`		`-pass`
`184`		`-exceptException:`
	`177`	`+self.ssl_verify=_config.get(self.gitlab_id,"ssl_verify")`
	`178`	`+except (configparser.NoOptionError,configparser.NoSectionError):`
`185`	`179`	`pass`
`186`	`180`
`187`	`181`	`try:`
`188`	`182`	`self.timeout=_config.getint("global","timeout")`
`189`		`-exceptException:`
	`183`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`190`	`184`	`pass`
`191`	`185`	`try:`
`192`	`186`	`self.timeout=_config.getint(self.gitlab_id,"timeout")`
`193`		`-exceptException:`
	`187`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`194`	`188`	`pass`
`195`	`189`
`196`	`190`	`try:`
`197`	`191`	`self.private_token=_config.get(self.gitlab_id,"private_token")`
`198`		`-exceptException:`
	`192`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`199`	`193`	`pass`
`200`	`194`
`201`	`195`	`try:`
`202`	`196`	`self.oauth_token=_config.get(self.gitlab_id,"oauth_token")`
`203`		`-exceptException:`
	`197`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`204`	`198`	`pass`
`205`	`199`
`206`	`200`	`try:`
`207`	`201`	`self.job_token=_config.get(self.gitlab_id,"job_token")`
`208`		`-exceptException:`
	`202`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`209`	`203`	`pass`
`210`	`204`
`211`	`205`	`try:`
`212`	`206`	`self.http_username=_config.get(self.gitlab_id,"http_username")`
`213`	`207`	`self.http_password=_config.get(`
`214`	`208`	`self.gitlab_id,"http_password"`
`215`	`209`	`)# pragma: no cover`
`216`		`-exceptException:`
	`210`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`217`	`211`	`pass`
`218`	`212`
`219`	`213`	`self._get_values_from_helper()`
`220`	`214`
`221`	`215`	`try:`
`222`	`216`	`self.api_version=_config.get("global","api_version")`
`223`		`-exceptException:`
	`217`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`224`	`218`	`pass`
`225`	`219`	`try:`
`226`	`220`	`self.api_version=_config.get(self.gitlab_id,"api_version")`
`227`		`-exceptException:`
	`221`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`228`	`222`	`pass`
`229`	`223`	`ifself.api_versionnotin ("4",):`
`230`	`224`	`raiseGitlabDataError(f"Unsupported API version:{self.api_version}")`
`231`	`225`
`232`	`226`	`forsectionin ["global",self.gitlab_id]:`
`233`	`227`	`try:`
`234`	`228`	`self.per_page=_config.getint(section,"per_page")`
`235`		`-exceptException:`
	`229`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`236`	`230`	`pass`
`237`	`231`	`ifself.per_pageisnotNoneandnot0<=self.per_page<=100:`
`238`	`232`	`raiseGitlabDataError(f"Unsupported per_page number:{self.per_page}")`
`239`	`233`
`240`	`234`	`try:`
`241`	`235`	`self.pagination=_config.get(self.gitlab_id,"pagination")`
`242`		`-exceptException:`
	`236`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`243`	`237`	`pass`
`244`	`238`
`245`	`239`	`try:`
`246`	`240`	`self.order_by=_config.get(self.gitlab_id,"order_by")`
`247`		`-exceptException:`
	`241`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`248`	`242`	`pass`
`249`	`243`
`250`	`244`	`try:`
`251`	`245`	`self.user_agent=_config.get("global","user_agent")`
`252`		`-exceptException:`
	`246`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`253`	`247`	`pass`
`254`	`248`	`try:`
`255`	`249`	`self.user_agent=_config.get(self.gitlab_id,"user_agent")`
`256`		`-exceptException:`
	`250`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`257`	`251`	`pass`
`258`	`252`
`259`	`253`	`try:`
`260`	`254`	`self.retry_transient_errors=_config.getboolean(`
`261`	`255`	`"global","retry_transient_errors"`
`262`	`256`	`)`
`263`		`-exceptException:`
	`257`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`264`	`258`	`pass`
`265`	`259`	`try:`
`266`	`260`	`self.retry_transient_errors=_config.getboolean(`
`267`	`261`	`self.gitlab_id,"retry_transient_errors"`
`268`	`262`	`)`
`269`		`-exceptException:`
	`263`	`+except(configparser.NoOptionError,configparser.NoSectionError):`
`270`	`264`	`pass`
`271`	`265`
`272`	`266`	`def_get_values_from_helper(self)->None:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1471c82

File tree

1 file changed

1 file changed

`‎gitlab/config.py`

0 commit comments