Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: More fixes

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-08 19:29:23 +05:30
parent 383d6cde29
commit b1623bc558
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/smtp.py
View File

@ -13,7 +13,7 @@ This module implements a simple commandline SMTP client that supports:
import sys, traceback, os, socket, encodings.idna as idna import sys, traceback, os, socket, encodings.idna as idna
from calibre import isbytestring from calibre import isbytestring
from calibre.constants import ispy3, iswindows from calibre.constants import ispy3, iswindows
from polyglot.builtins import unicode_type from polyglot.builtins import unicode_type, as_unicode
def decode_fqdn(fqdn): def decode_fqdn(fqdn):
@ -35,7 +35,7 @@ def safe_localhost():
# Some mail servers have problems with non-ascii local hostnames, see # Some mail servers have problems with non-ascii local hostnames, see
# https://bugs.launchpad.net/bugs/1256549 # https://bugs.launchpad.net/bugs/1256549
try: try:
local_hostname = idna.ToASCII(fqdn) local_hostname = as_unicode(idna.ToASCII(fqdn))
except Exception: except Exception:
local_hostname = 'localhost.localdomain' local_hostname = 'localhost.localdomain'
else: else:
@ -162,6 +162,10 @@ def sendmail(msg, from_, to, localhost=None, verbose=0, timeout=None,
if verify_server_cert: if verify_server_cert:
import ssl import ssl
context = ssl.create_default_context(cafile=cafile) context = ssl.create_default_context(cafile=cafile)
if not getattr(s, '_host', None) and ispy3:
# needed because as of python 3.7 starttls expects _host to be set,
# bu we cant set it via the constructor
s._host = relay
s.starttls(context=context) s.starttls(context=context)
s.ehlo() s.ehlo()
if username is not None and password is not None: if username is not None and password is not None: