This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11919

pytype: stop excluding wireprotov2server.py
ClosedPublic

Authored by mharbison72 on Dec 14 2021, 4:10 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHGcfb4f1dee978: pytype: stop excluding wireprotov2server.py

Summary

This fixes:

File "/mnt/c/Users/Matt/hg/mercurial/wireprotov2server.py", line 584, in _capabilitiesv2:
    unsupported operand type(s) for item assignment: Set[bytes] [unsupported-operands]
  No attribute '__setitem__' on Set[bytes]
File "/mnt/c/Users/Matt/hg/mercurial/wireprotov2server.py", line 611, in _capabilitiesv2:
    No attribute 'append' on dict [attribute-error]
  In Union[List[bytes], List[nothing], dict]
Called from (traceback):
  line 543, in httpv2apidescriptor

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.Dec 14 2021, 4:10 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 14 2021, 4:10 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

mharbison72 added a child revision: D11920: statprof: convert a few exception byte strings to str.Dec 14 2021, 4:10 PM

FYI this is staged for removal, I just have to get around to finishing it.

This revision is now accepted and ready to land.Dec 15 2021, 5:24 AM

mharbison72 added a commit: rHGcfb4f1dee978: pytype: stop excluding wireprotov2server.py.Dec 17 2021, 6:10 AM

Closed by commit rHGcfb4f1dee978: pytype: stop excluding wireprotov2server.py (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/wireprotov2server.py (4 lines)
M			tests/test-check-pytype.t (2 lines)

Status	Author	Revision
Closed	mharbison72	D11924 pytype: stop excluding webcommands.py
Closed	mharbison72	D11923 tests: drop an obsolete comment about a pytype failure
Closed	mharbison72	D11922 pytype: stop excluding patch.py
Closed	mharbison72	D11921 pytype: stop excluding statprof.py
Closed	mharbison72	D11920 statprof: convert a few exception byte strings to str
Closed	mharbison72	D11919 pytype: stop excluding wireprotov2server.py
Closed	mharbison72	D11918 pytype: stop excluding stringutil.py
Closed	mharbison72	D11917 pytype: stop excluding cmdutil.py
Closed	mharbison72	D11916 pytype: stop excluding copies.py
Closed	mharbison72	D11915 copies: fix some documentation typos
Closed	mharbison72	D11914 copies: drop an unused variable
Closed	mharbison72	D11913 pytype: stop excluding lsprof.py
Closed	mharbison72	D11912 pytype: stop excluding changegroup.py
Closed	mharbison72	D11911 pytype: stop excluding upgrade.py

Diff 31513

mercurial/wireprotov2server.py


	# TODO this type of check should be defined in a per-command callback.			# TODO this type of check should be defined in a per-command callback.
	if (			if (
	command == b'rawstorefiledata'			command == b'rawstorefiledata'
	and not streamclone.allowservergeneration(repo)			and not streamclone.allowservergeneration(repo)
	):			):
	continue			continue

				# pytype: disable=unsupported-operands
	caps[b'commands'][command] = {			caps[b'commands'][command] = {
	b'args': args,			b'args': args,
	b'permissions': [entry.permission],			b'permissions': [entry.permission],
	}			}
				# pytype: enable=unsupported-operands

	if entry.extracapabilitiesfn:			if entry.extracapabilitiesfn:
	extracaps = entry.extracapabilitiesfn(repo, proto)			extracaps = entry.extracapabilitiesfn(repo, proto)
	caps[b'commands'][command].update(extracaps)			caps[b'commands'][command].update(extracaps)

	caps[b'rawrepoformats'] = sorted(repo.requirements & repo.supportedformats)			caps[b'rawrepoformats'] = sorted(repo.requirements & repo.supportedformats)

	targets = getadvertisedredirecttargets(repo, proto)			targets = getadvertisedredirecttargets(repo, proto)
	b'protocol': target[b'protocol'],			b'protocol': target[b'protocol'],
	b'uris': target[b'uris'],			b'uris': target[b'uris'],
	}			}

	for key in (b'snirequired', b'tlsversions'):			for key in (b'snirequired', b'tlsversions'):
	if key in target:			if key in target:
	entry[key] = target[key]			entry[key] = target[key]

				# pytype: disable=attribute-error
	caps[b'redirect'][b'targets'].append(entry)			caps[b'redirect'][b'targets'].append(entry)
				# pytype: enable=attribute-error

	return proto.addcapabilities(repo, caps)			return proto.addcapabilities(repo, caps)


	def getadvertisedredirecttargets(repo, proto):			def getadvertisedredirecttargets(repo, proto):
	"""Obtain a list of content redirect targets.			"""Obtain a list of content redirect targets.

	Returns a list containing potential redirect targets that will be			Returns a list containing potential redirect targets that will be

tests/test-check-pytype.t

	mercurial/util.py # [attribute-error], [wrong-arg-count]			mercurial/util.py # [attribute-error], [wrong-arg-count]
	mercurial/utils/procutil.py # [attribute-error], [module-attr], [bad-return-type]			mercurial/utils/procutil.py # [attribute-error], [module-attr], [bad-return-type]
	mercurial/utils/memorytop.py # not 3.6 compatible			mercurial/utils/memorytop.py # not 3.6 compatible
	mercurial/win32.py # [not-callable]			mercurial/win32.py # [not-callable]
	mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error]			mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error]
	mercurial/wireprotoserver.py # line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any], Any] [attribute-error]			mercurial/wireprotoserver.py # line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any], Any] [attribute-error]
	mercurial/wireprotov1peer.py # [attribute-error]			mercurial/wireprotov1peer.py # [attribute-error]
	mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs			mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs
	mercurial/wireprotov2server.py # [unsupported-operands], [attribute-error]

	TODO: use --no-cache on test server? Caching the files locally helps during			TODO: use --no-cache on test server? Caching the files locally helps during
	development, but may be a hinderance for CI testing.			development, but may be a hinderance for CI testing.

	$ pytype -V 3.6 --keep-going --jobs auto mercurial \			$ pytype -V 3.6 --keep-going --jobs auto mercurial \
	> -x mercurial/bundlerepo.py \			> -x mercurial/bundlerepo.py \
	> -x mercurial/chgserver.py \			> -x mercurial/chgserver.py \
	> -x mercurial/context.py \			> -x mercurial/context.py \
	> -x mercurial/unionrepo.py \			> -x mercurial/unionrepo.py \
	> -x mercurial/utils/procutil.py \			> -x mercurial/utils/procutil.py \
	> -x mercurial/utils/memorytop.py \			> -x mercurial/utils/memorytop.py \
	> -x mercurial/win32.py \			> -x mercurial/win32.py \
	> -x mercurial/wireprotoframing.py \			> -x mercurial/wireprotoframing.py \
	> -x mercurial/wireprotoserver.py \			> -x mercurial/wireprotoserver.py \
	> -x mercurial/wireprotov1peer.py \			> -x mercurial/wireprotov1peer.py \
	> -x mercurial/wireprotov1server.py \			> -x mercurial/wireprotov1server.py \
	> -x mercurial/wireprotov2server.py \
	> > $TESTTMP/pytype-output.txt \|\| cat $TESTTMP/pytype-output.txt			> > $TESTTMP/pytype-output.txt \|\| cat $TESTTMP/pytype-output.txt

	Only show the results on a failure, because the output on success is also			Only show the results on a failure, because the output on success is also
	voluminous and variable.			voluminous and variable.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31476		Dec 14 2021, 4:10 PM	★	★
Diff 2	31513	rHGcfb4f1dee97806b54096210964273b2d87a6e8fa	Dec 13 2021, 4:42 PM	★	★