This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8902

templater: replace Py3-only exception types by super-types available in Py2
ClosedPublic

Authored by martinvonz on Aug 6 2020, 1:27 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6e6fe826ba69: templater: replace Py3-only exception types by super-types available in Py2
Summary

As noted by @indygreg, test-check-pyflakes.t started failing on Py2
after my recent D8894, because that introduced catching of the
Py3-only types ModuleNotFoundError and FileNotFoundError. Let's
switch to less precise types that are also available in Py2.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/templater.py (2 lines)

Diff 22318

mercurial/templater.py

else: else:
name_parts = pycompat.sysstr(name).split('/') name_parts = pycompat.sysstr(name).split('/')
package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1]) package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1])
try: try:
return ( return (
name, name,
resourceutil.open_resource(package_name, name_parts[-1]), resourceutil.open_resource(package_name, name_parts[-1]),
) )
except (ModuleNotFoundError, FileNotFoundError): except (ImportError, OSError):
return None, None return None, None