This is an archive of the discontinued Mercurial Phabricator instance.

Could you please look into this in more detail? Presumably the type checker isn't seeing that pycompat.bytestr will accept anything that can be cast to str, which Exception can. So this feels like it is either a bug in pytype or a missing annotation somewhere. I'd like to know which.

But the comment draws attention to oddness. (I'm assuming we'll be able to disable most type annotator disables long term once more of the code base is properly type annotated.) So I'm fine landing this.

This revision is now accepted and ready to land.Nov 8 2019, 11:46 AM

durin42 added a commit: rHG1a47fe4bc154: branchmap: pytype is confused about bytestr.Nov 8 2019, 11:48 AM

Closed by commit rHG1a47fe4bc154: branchmap: pytype is confused about bytestr (authored by durin42). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/branchmap.py (8 lines)

Commit	Parents	Author	Summary	Date
3dd91f6cf9a4	93cbd4526f51	Augie Fackler		Nov 6 2019, 4:30 PM

Status	Author	Revision
Closed	durin42	D7406 scmutil: convert status data object from a tuple to an attrs (API)
Closed	durin42	D7405 perf: bool() elements of dirstate.status return instead of len()
Closed	durin42	D7404 tags: use field names instead of field numbers on scmutil.status
Closed	durin42	D7403 subrepo: use field names instead of field numbers on scmutil.status
Closed	durin42	D7402 revset: use field names instead of field numbers on scmutil.status
Closed	durin42	D7401 patch: use field names instead of field numbers on scmutil.status
Closed	durin42	D7400 logcmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7399 context: use field names instead of field numbers on scmutil.status
Closed	durin42	D7398 commands: use field names instead of field numbers on scmutil.status
Closed	durin42	D7397 cmdutil: convert terse status result back to an scmutil.status
Closed	durin42	D7396 cmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7395 uncommit: use field names instead of field numbers on scmutil.status
Closed	durin42	D7394 transplant: use field names instead of field numbers on scmutil.status
Closed	durin42	D7393 split: use field names instead of field numbers on scmutil.status
Closed	durin42	D7392 mq: use field names instead of field numbers on scmutil.status
Closed	durin42	D7391 hgk: use field names instead of field numbers on scmutil.status
Closed	durin42	D7390 extdiff: use field names instead of field numbers on scmutil.status
Closed	durin42	D7410 extensions: suppress a pytype failure due to a typeshed bug
Closed	durin42	D7409 dispatch: add some assertions to give pytype a helping hand
Closed	durin42	D7408 extensions: hide two confusing import statements from pytype
Closed	durin42	D7407 debugcommands: add assertions to convince pytype peer is not None
Closed	durin42	D7385 debugcommands: suppress import errors for pytype
Closed	durin42	D7383 state: add a pytype annotation
Closed	durin42	D7382 logcmdutil: add a type annotation
Closed	durin42	D7381 cmdutil: add a pytype annotation to help out some callsites
Abandoned	durin42	D7297 cleanup: remove now-obsolete wrong-arg-type annotations
Changes Planned	mharbison72	D7515 pytype: [WIP] suppress various warnings inline to get a clean run
Needs Revision	durin42	D7295 pytype: add a (very slow) test that executes pytype
Needs Revision	durin42	D7384 commands: necessary annotations and suppresssions to pass pytype
Changes Planned	durin42	D7296 pycompat: kludge around pytype being confused by __new__
Abandoned	durin42	D7380 encoding: define per-use identity functions only in typechecking mode
Closed	durin42	D7379 encoding: fix bad type annotation
Closed	durin42	D7389 branchmap: annotate constructor type for branchcache
Closed	durin42	D7378 debugcommands: don't shadow the error module
Closed	durin42	D7294 cmdutil: suppress bogus pytype errors
Closed	durin42	D7293 changegroup: suppress pytype error that's wrong
Closed	durin42	D7292 changegroup: avoid shadowing a set with an int
Closed	durin42	D7291 bundle2: more pytype suppressions around bytestring
Closed	durin42	D7290 branchmap: pytype is confused about bytestr
Closed	durin42	D7289 branchmap: correctly set()-ify list argument

Diff 17660

mercurial/branchmap.py

	bcache.load(repo, lineiter)			bcache.load(repo, lineiter)
	except (IOError, OSError):			except (IOError, OSError):
	return None			return None

	except Exception as inst:			except Exception as inst:
	if repo.ui.debugflag:			if repo.ui.debugflag:
	msg = b'invalid %s: %s\n'			msg = b'invalid %s: %s\n'
	repo.ui.debug(			repo.ui.debug(
	msg % (_branchcachedesc(repo), pycompat.bytestr(inst))			msg
				% (
				_branchcachedesc(repo),
				pycompat.bytestr(
				inst # pytype: disable=wrong-arg-types
				),
				)
	)			)
	bcache = None			bcache = None

	finally:			finally:
	if f:			if f:
	f.close()			f.close()

	return bcache			return bcache

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17660		Nov 6 2019, 5:59 PM	★	★
Diff 2	17789	rHG1a47fe4bc154e5c88a404de09ace295cd6b3e03b	Nov 6 2019, 4:30 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

branchmap: pytype is confused about bytestrClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 17660

mercurial/branchmap.py

branchmap: pytype is confused about bytestr
ClosedPublic

Revision Contents
Changeset List