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

Sending email: Fix an error on some windows machines with non-ASCII hostnames

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-26 08:41:36 +05:30
parent 1a7a1b27e8
commit 73493976e8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,21 +11,31 @@ 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, force_unicode from calibre import isbytestring
from calibre.constants import ispy3 from calibre.constants import ispy3, iswindows
from polyglot.builtins import unicode_type from polyglot.builtins import unicode_type
def decode_fqdn(fqdn):
if isinstance(fqdn, bytes):
enc = 'mbcs' if iswindows else 'utf-8'
try:
fqdn = fqdn.decode(enc)
except Exception:
fqdn = ''
return fqdn
def safe_localhost(): def safe_localhost():
# RFC 2821 says we should use the fqdn in the EHLO/HELO verb, and # RFC 2821 says we should use the fqdn in the EHLO/HELO verb, and
# if that can't be calculated, that we should use a domain literal # if that can't be calculated, that we should use a domain literal
# instead (essentially an encoded IP address like [A.B.C.D]). # instead (essentially an encoded IP address like [A.B.C.D]).
fqdn = socket.getfqdn() fqdn = decode_fqdn(socket.getfqdn())
if '.' in fqdn and fqdn != '.': if '.' in fqdn and fqdn != '.':
# 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(force_unicode(fqdn)) local_hostname = idna.ToASCII(fqdn)
except Exception: except Exception:
local_hostname = 'localhost.localdomain' local_hostname = 'localhost.localdomain'
else: else: