This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			mercurial/cffi/bdiff.py (2 lines)
M			mercurial/cffi/mpatch.py (2 lines)
M			mercurial/cffi/osutil.py (2 lines)
M			mercurial/debugcommands.py (2 lines)
M			mercurial/sslutil.py (2 lines)
M			mercurial/testing/revlog.py (2 lines)
M			mercurial/urllibcompat.py (3 lines)
M			mercurial/utils/hashutil.py (2 lines)

Status	Author	Revision
Closed	mharbison72	D10215 typing: rewrite a conditional assignment to unconfuse pytype
Closed	mharbison72	D10214 typing: add assertions to localrepo.py to appease pytype
Closed	mharbison72	D10213 obsutil: maintain a homogenous list when computing successors
Closed	mharbison72	D10212 typing: add an assertion to verify.py to appease pytype
Closed	mharbison72	D10211 typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
Closed	mharbison72	D10210 crecord: null out the curses attribute with `None` on failure to import
Closed	mharbison72	D10209 typing: fix directives mangled by black
Closed	mharbison72	D10208 typing: disable module attribute warnings for properly conditionalized code
Closed	mharbison72	D10207 typing: disable import error warnings that are already handled
Closed	mharbison72	D10206 typing: disable a few errors when accessing Windows specific attributes
Closed	mharbison72	D10205 typing: disable a few errors calling py3.7+ functions in resourceutil.py
Closed	mharbison72	D10204 wsgicgi: switch the default PATH_INFO back to str
Closed	mharbison72	D10203 crecord: convert an instance of bytes to str
Closed	mharbison72	D10202 crecord: change str literals to byte literals
Closed	mharbison72	D10201 bisect: replace a missing method on the list primitive
Closed	mharbison72	D10183 typing: disable a module-attr warning in the worker module's py2 code
Closed	mharbison72	D10182 wireprotoserver: convert ErrorResponse to bytes
Closed	mharbison72	D10181 verify: convert an exception to bytes before logging
Closed	mharbison72	D10180 typing: add an assertion to the upgrade engine to help pytype
Closed	mharbison72	D10179 subrepo: handle unexpected file types from git gracefully
Closed	mharbison72	D10178 patch: convert a UI message to bytes when editing a patch
Closed	mharbison72	D10177 merge: force an exception message to bytes before printing as a warning
Closed	mharbison72	D10176 hg: convert an exception to bytes in the repo creation exception handler
Closed	mharbison72	D10175 typing: add an assertion instead of blacklisting mercurial/extensions.py
Closed	mharbison72	D10174 debug: convert a few exceptions to bytes before wrapping in another error
Closed	mharbison72	D10173 grep: convert an exception to bytes for a warning message
Closed	mharbison72	D10172 morestatus: convert a UI message about merge conflicts to bytes
Closed	mharbison72	D10171 changegroup: convert a warning message to bytes
Closed	mharbison72	D10170 branchmap: force Exception to bytes before logging
Closed	mharbison72	D10169 nodemap: convert error message to bytes
Closed	mharbison72	D10168 mail: convert SMTPException to bytes before passing to error.Abort()
Closed	mharbison72	D10167 typing: switch an argument type to the generic form
Closed	mharbison72	D10166 typing: ensure that error.Abort is given bytes
Closed	mharbison72	D10165 typing: fix a suppression directive that was mangled by black formatting

Diff 26500

mercurial/cffi/bdiff.py

	# bdiff.py - CFFI implementation of bdiff.c			# bdiff.py - CFFI implementation of bdiff.c
	#			#
	# Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>			# Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	import struct			import struct

	from ..pure.bdiff import *			from ..pure.bdiff import *
	from . import _bdiff			from . import _bdiff # pytype: disable=import-error

	ffi = _bdiff.ffi			ffi = _bdiff.ffi
	lib = _bdiff.lib			lib = _bdiff.lib


	def blocks(sa, sb):			def blocks(sa, sb):
	a = ffi.new(b"struct bdiff_line**")			a = ffi.new(b"struct bdiff_line**")
	b = ffi.new(b"struct bdiff_line**")			b = ffi.new(b"struct bdiff_line**")

mercurial/cffi/mpatch.py

	# mpatch.py - CFFI implementation of mpatch.c			# mpatch.py - CFFI implementation of mpatch.c
	#			#
	# Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>			# Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	from ..pure.mpatch import *			from ..pure.mpatch import *
	from ..pure.mpatch import mpatchError # silence pyflakes			from ..pure.mpatch import mpatchError # silence pyflakes
	from . import _mpatch			from . import _mpatch # pytype: disable=import-error

	ffi = _mpatch.ffi			ffi = _mpatch.ffi
	lib = _mpatch.lib			lib = _mpatch.lib


	@ffi.def_extern()			@ffi.def_extern()
	def cffi_get_next_item(arg, pos):			def cffi_get_next_item(arg, pos):
	all, bins = ffi.from_handle(arg)			all, bins = ffi.from_handle(arg)

mercurial/cffi/osutil.py

	import os			import os
	import stat as statmod			import stat as statmod

	from ..pure.osutil import *			from ..pure.osutil import *

	from .. import pycompat			from .. import pycompat

	if pycompat.isdarwin:			if pycompat.isdarwin:
	from . import _osutil			from . import _osutil # pytype: disable=import-error

	ffi = _osutil.ffi			ffi = _osutil.ffi
	lib = _osutil.lib			lib = _osutil.lib

	listdir_batch_size = 4096			listdir_batch_size = 4096
	# tweakable number, only affects performance, which chunks			# tweakable number, only affects performance, which chunks
	# of bytes do we get back from getattrlistbulk			# of bytes do we get back from getattrlistbulk

mercurial/debugcommands.py

	)			)
	fm.write(			fm.write(
	b'pythonlib',			b'pythonlib',
	_(b"checking Python lib (%s)...\n"),			_(b"checking Python lib (%s)...\n"),
	pythonlib or _(b"unknown"),			pythonlib or _(b"unknown"),
	)			)

	try:			try:
	from . import rustext			from . import rustext # pytype: disable=import-error

	rustext.__doc__ # trigger lazy import			rustext.__doc__ # trigger lazy import
	except ImportError:			except ImportError:
	rustext = None			rustext = None

	security = set(sslutil.supportedprotocols)			security = set(sslutil.supportedprotocols)
	if sslutil.hassni:			if sslutil.hassni:
	security.add(b'sni')			security.add(b'sni')

mercurial/sslutil.py

	server (and client) support SNI, this tells the server which certificate			server (and client) support SNI, this tells the server which certificate
	to use.			to use.
	"""			"""
	if not serverhostname:			if not serverhostname:
	raise error.Abort(_(b'serverhostname argument is required'))			raise error.Abort(_(b'serverhostname argument is required'))

	if b'SSLKEYLOGFILE' in encoding.environ:			if b'SSLKEYLOGFILE' in encoding.environ:
	try:			try:
	import sslkeylog			import sslkeylog # pytype: disable=import-error

	sslkeylog.set_keylog(			sslkeylog.set_keylog(
	pycompat.fsdecode(encoding.environ[b'SSLKEYLOGFILE'])			pycompat.fsdecode(encoding.environ[b'SSLKEYLOGFILE'])
	)			)
	ui.warnnoi18n(			ui.warnnoi18n(
	b'sslkeylog enabled by SSLKEYLOGFILE environment variable\n'			b'sslkeylog enabled by SSLKEYLOGFILE environment variable\n'
	)			)
	except ImportError:			except ImportError:

mercurial/testing/revlog.py

	b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'			b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'
	b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'			b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'
	b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'			b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'
	b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'			b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
	)			)


	try:			try:
	from ..cext import parsers as cparsers			from ..cext import parsers as cparsers # pytype: disable=import-error
	except ImportError:			except ImportError:
	cparsers = None			cparsers = None


	@unittest.skipIf(			@unittest.skipIf(
	cparsers is None,			cparsers is None,
	'The C version of the "parsers" module is not available. It is needed for this test.',			'The C version of the "parsers" module is not available. It is needed for this test.',
	)			)
	class RevlogBasedTestBase(unittest.TestCase):			class RevlogBasedTestBase(unittest.TestCase):
	def parseindex(self):			def parseindex(self):
	return cparsers.parse_index2(data_non_inlined, False)[0]			return cparsers.parse_index2(data_non_inlined, False)[0]

mercurial/urllibcompat.py

	def getdata(req):			def getdata(req):
	return req.data			return req.data

	def hasdata(req):			def hasdata(req):
	return req.data is not None			return req.data is not None


	else:			else:
				# pytype: disable=import-error
	import BaseHTTPServer			import BaseHTTPServer
	import CGIHTTPServer			import CGIHTTPServer
	import SimpleHTTPServer			import SimpleHTTPServer
	import urllib2			import urllib2
	import urllib			import urllib
	import urlparse			import urlparse

				# pytype: enable=import-error

	urlreq._registeraliases(			urlreq._registeraliases(
	urllib,			urllib,
	(			(
	b"addclosehook",			b"addclosehook",
	b"addinfourl",			b"addinfourl",
	b"ftpwrapper",			b"ftpwrapper",
	b"pathname2url",			b"pathname2url",
	b"quote",			b"quote",

mercurial/utils/hashutil.py

	from __future__ import absolute_import			from __future__ import absolute_import

	import hashlib			import hashlib

	try:			try:
	from ..thirdparty import sha1dc			from ..thirdparty import sha1dc # pytype: disable=import-error

	sha1 = sha1dc.sha1			sha1 = sha1dc.sha1
	except (ImportError, AttributeError):			except (ImportError, AttributeError):
	sha1 = hashlib.sha1			sha1 = hashlib.sha1

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26321		Mar 13 2021, 2:33 PM	★	★
Diff 2	26500	rHG521ac0d7047f1b9c9a1ac4e4a681802d802ebeb1	Mar 13 2021, 12:38 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

typing: disable import error warnings that are already handledClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26500

mercurial/cffi/bdiff.py

mercurial/cffi/mpatch.py

mercurial/cffi/osutil.py

mercurial/debugcommands.py

mercurial/sslutil.py

mercurial/testing/revlog.py

mercurial/urllibcompat.py

mercurial/utils/hashutil.py

typing: disable import error warnings that are already handled
ClosedPublic

Revision Contents
Changeset List