This is an archive of the discontinued Mercurial Phabricator instance.

util: avoid a name-error warning in the `mmapread` exception handler
ClosedPublic

Authored by mharbison72 on Sep 21 2021, 11:38 AM.

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

Summary

Newly caught by pytype 2021-09-09.

File "/mnt/c/Users/Matt/hg/mercurial/util.py", line 458, in mmapread: Name 'fd' is not defined [name-error]

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Actually useful!

This revision is now accepted and ready to land.Sep 22 2021, 3:45 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/util.py (2 lines)

Status	Author	Revision
Closed	mharbison72	D11476 extensions: prevent a crash on py3 with a `minimumhgversion` str value
Closed	mharbison72	D11475 extensions: prevent a crash on py3 when testing a bad extension minimum
Closed	mharbison72	D11474 typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes
Closed	mharbison72	D11473 util: eliminate the possibility of returning None from `versiontuple()`
Closed	mharbison72	D11472 archival: force a `CompressionError` to bytes before passing to `error.Abort`
Closed	mharbison72	D11471 parser: force a `ValueError` to bytes before passing to `error.ParseError`
Closed	mharbison72	D11470 util: avoid a name-error warning in the `mmapread` exception handler
Closed	mharbison72	D11469 typing: suppress an name-error warning in `mercurial/windows.py`
Closed	mharbison72	D11468 typing: suppress an import-error warning in `mercurial/utils/resourceutil.py`
Closed	mharbison72	D11467 encoding: force a few Errors to bytes before passing to `error.Abort`
Closed	mharbison72	D11466 typing: add a fake `__init__()` to bytestr to distract pytype


	def mmapread(fp, size=None):			def mmapread(fp, size=None):
	if size == 0:			if size == 0:
	# size of 0 to mmap.mmap() means "all data"			# size of 0 to mmap.mmap() means "all data"
	# rather than "zero bytes", so special case that.			# rather than "zero bytes", so special case that.
	return b''			return b''
	elif size is None:			elif size is None:
	size = 0			size = 0
	try:
	fd = getattr(fp, 'fileno', lambda: fp)()			fd = getattr(fp, 'fileno', lambda: fp)()
				try:
	return mmap.mmap(fd, size, access=mmap.ACCESS_READ)			return mmap.mmap(fd, size, access=mmap.ACCESS_READ)
	except ValueError:			except ValueError:
	# Empty files cannot be mmapped, but mmapread should still work. Check			# Empty files cannot be mmapped, but mmapread should still work. Check
	# if the file is empty, and if so, return an empty buffer.			# if the file is empty, and if so, return an empty buffer.
	if os.fstat(fd).st_size == 0:			if os.fstat(fd).st_size == 0:
	return b''			return b''
	raise			raise