This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10376

re2: adjust local variable assignment scope
ClosedPublic

Authored by mharbison72 on Apr 13 2021, 12:02 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9c3e84569071: re2: adjust local variable assignment scope
Summary

Pytype flagged the exception handler where these are used as [name-error], and
PyCharm complained they may be used before assignment.

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.

Event Timeline

mharbison72 created this revision.Apr 13 2021, 12:02 AM
mharbison72 added a comment.Apr 13 2021, 12:04 AM

The commit this fixes is on stable, but since the test to run pytype is on default, it probably doesn't matter where it goes.

pulkit accepted this revision.Apr 13 2021, 8:54 AM
This revision is now accepted and ready to land.Apr 13 2021, 8:54 AM
mharbison72 added a commit: rHG9c3e84569071: re2: adjust local variable assignment scope.Apr 15 2021, 9:44 AM
Closed by commit rHG9c3e84569071: re2: adjust local variable assignment scope (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (5 lines)

Diff 26928

mercurial/util.py

except ImportError: except ImportError:
_re2 = False _re2 = False
class _re(object): class _re(object):
def _checkre2(self): def _checkre2(self):
global _re2 global _re2
global _re2_input global _re2_input
try:
# check if match works, see issue3964
check_pattern = br'\[([^\[]+)\]' check_pattern = br'\[([^\[]+)\]'
check_input = b'[ui]' check_input = b'[ui]'
try:
# check if match works, see issue3964
_re2 = bool(re2.match(check_pattern, check_input)) _re2 = bool(re2.match(check_pattern, check_input))
except ImportError: except ImportError:
_re2 = False _re2 = False
except TypeError: except TypeError:
# the `pyre-2` project provides a re2 module that accept bytes # the `pyre-2` project provides a re2 module that accept bytes
# the `fb-re2` project provides a re2 module that acccept sysstr # the `fb-re2` project provides a re2 module that acccept sysstr
check_pattern = pycompat.sysstr(check_pattern) check_pattern = pycompat.sysstr(check_pattern)
check_input = pycompat.sysstr(check_input) check_input = pycompat.sysstr(check_input)