This is an archive of the discontinued Mercurial Phabricator instance.

+def _pyhastls():
+ """Returns true iff Python has TLS support, false otherwise."""
+ try:
+ import ssl
+ getattr(ssl, 'HAS_TLS', False)
+ return True
+ except ImportError:
+ return False

Maybe we can simply remove the check since we've dropped support for
Python 2.5.

Maybe we can simply remove the check since we've dropped support for
Python 2.5.

No, we're looking to see if the ssl module is importable - if it's not, that means Python was compiled without TLS support (which is an option, even on 3.x and 2.7). I'm just sniffing for this particular attribute to force the import. Maybe I should add a comment?

>   Maybe we can simply remove the check since we've dropped support for
>   Python 2.5.
No, we're looking to see if the ssl module is importable - if it's not, that means Python was compiled without TLS support (which is an option, even on 3.x and 2.7). I'm just sniffing for this particular attribute to force the import.

That's true, but I don't think we've ever had support for Python 2.6+ without
OpenSSL. Some commands would work thanks to our demandimport, but it also means
some stdlib modules (e.g. httlib) would be broken because import ssl doesn't
fail.

durin42 updated this revision to Diff 10191.Aug 9 2018, 4:43 PM

durin42 updated this revision to Diff 10195.Aug 9 2018, 4:48 PM

I think this utility function should live in sslutil.py.

mercurial/mail.py
85–92	We may want to consider moving this to `sslutil.py` and refactoring `sslutil.py` to not crash and burn if the `ssl` module doesn't work (which I'm pretty sure it will do today).

This revision is now accepted and ready to land.Aug 9 2018, 11:00 PM

Closed by commit rHG569d662816de: mail: modernize check for Python-with-TLS (authored by durin42). · Explain WhyAug 9 2018, 11:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/mail.py (11 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9611		Jul 16 2018, 7:16 PM	★	★
Diff 2	10191		Aug 9 2018, 4:43 PM	★	★
Diff 3	10195		Aug 9 2018, 4:48 PM	★	★
Diff 4	10247	rHG569d662816de326ff2c687edda586aaedf4cb416	Jul 16 2018, 6:16 PM	★	★

Commit	Parents	Author	Summary	Date
		Augie Fackler		Jul 16 2018, 6:16 PM

Status	Author	Revision
Closed	durin42	D4234 tests: allow for a bonus newline in base64'd email payload
Closed	durin42	D4233 mail: be more cautious about bytes vs str for py3 compat
Closed	durin42	D4232 patchbomb: use native strings when determining attachment disposition
Closed	durin42	D4231 mail: always fall back to iso-8859-1 if us-ascii won't work (BC)
Closed	durin42	D4230 tests: put some Python 3 polish on inline Python invocations
Closed	durin42	D4229 patchbomb: don't unintentionally duplicate headers
Closed	durin42	D4228 patchbomb: use sysstrs when describing content-type
Closed	durin42	D4223 patchbomb: use native strs for email header keys and values
Closed	durin42	D4222 patchbomb: use email.encoders instead of email.Encoders
Closed	durin42	D4221 mail: properly handle email addresses typically being unicodes
Closed	durin42	D4220 tests: fix Python3 issues in Python one-liners in test-patchbomb.t
Closed	durin42	D4219 dummysmtpd: accept additional kwargs from stdlib smtpd
Closed	durin42	D4218 mail: fix debug print, which appears to have been broken for a long time
Closed	durin42	D3957 patchbomb: python 3 really wants those email addresses in unicode
Closed	durin42	D3956 mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
Closed	durin42	D3955 mail: modernize check for Python-with-TLS
Closed	durin42	D3954 mail: cope with Py3 unicode antics on email addresses
Closed	durin42	D3953 mail: fix _encode to be more correct on Python 3
Closed	durin42	D3951 patchbomb: work around email module really wanting to write unicode data

Diff 10195

mercurial/mail.py

	new_socket = socket.create_connection((host, port), timeout)			new_socket = socket.create_connection((host, port), timeout)
	new_socket = sslutil.wrapsocket(new_socket,			new_socket = sslutil.wrapsocket(new_socket,
	self.keyfile, self.certfile,			self.keyfile, self.certfile,
	ui=self._ui,			ui=self._ui,
	serverhostname=self._host)			serverhostname=self._host)
	self.file = smtplib.SSLFakeFile(new_socket)			self.file = smtplib.SSLFakeFile(new_socket)
	return new_socket			return new_socket

				def _pyhastls():
				"""Returns true iff Python has TLS support, false otherwise."""
				try:
				import ssl
				getattr(ssl, 'HAS_TLS', False)
				return True
				except ImportError:
				return False
				indygregUnsubmitted Not Done We may want to consider moving this to `sslutil.py` and refactoring `sslutil.py` to not crash and burn if the `ssl` module doesn't work (which I'm pretty sure it will do today). indygreg: We may want to consider moving this to `sslutil.py` and refactoring `sslutil.py` to not crash…

	def _smtp(ui):			def _smtp(ui):
	'''build an smtp connection and return a function to send mail'''			'''build an smtp connection and return a function to send mail'''
	local_hostname = ui.config('smtp', 'local_hostname')			local_hostname = ui.config('smtp', 'local_hostname')
	tls = ui.config('smtp', 'tls')			tls = ui.config('smtp', 'tls')
	# backward compatible: when tls = true, we use starttls.			# backward compatible: when tls = true, we use starttls.
	starttls = tls == 'starttls' or stringutil.parsebool(tls)			starttls = tls == 'starttls' or stringutil.parsebool(tls)
	smtps = tls == 'smtps'			smtps = tls == 'smtps'
	if (starttls or smtps) and not util.safehasattr(socket, 'ssl'):			if (starttls or smtps) and not _pyhastls():
	raise error.Abort(_("can't use TLS: Python SSL support not installed"))			raise error.Abort(_("can't use TLS: Python SSL support not installed"))
	mailhost = ui.config('smtp', 'host')			mailhost = ui.config('smtp', 'host')
	if not mailhost:			if not mailhost:
	raise error.Abort(_('smtp.host not configured - cannot send mail'))			raise error.Abort(_('smtp.host not configured - cannot send mail'))
	if smtps:			if smtps:
	ui.note(_('(using smtps)\n'))			ui.note(_('(using smtps)\n'))
	s = SMTPS(ui, local_hostname=local_hostname, host=mailhost)			s = SMTPS(ui, local_hostname=local_hostname, host=mailhost)
	elif starttls:			elif starttls:

This is an archive of the discontinued Mercurial Phabricator instance.

mail: modernize check for Python-with-TLSClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 10195

mercurial/mail.py

mail: modernize check for Python-with-TLS
ClosedPublic

Revision Contents
Changeset List