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

Function ordering

Browse Source
This commit is contained in:
Kovid Goyal 2017-02-23 09:46:42 +05:30
parent 3ea07d58fb
commit 0763c8e1c3
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,29 @@ import sys, traceback, os, socket, encodings.idna as idna
from calibre import isbytestring, force_unicode from calibre import isbytestring, force_unicode
def safe_localhost():
# 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
# instead (essentially an encoded IP address like [A.B.C.D]).
fqdn = socket.getfqdn()
if '.' in fqdn:
# Some mail servers have problems with non-ascii local hostnames, see
# https://bugs.launchpad.net/bugs/1256549
try:
local_hostname = idna.ToASCII(force_unicode(fqdn))
except:
local_hostname = 'localhost.localdomain'
else:
# We can't find an fqdn hostname, so use a domain literal
addr = '127.0.0.1'
try:
addr = socket.gethostbyname(socket.gethostname())
except socket.gaierror:
pass
local_hostname = '[%s]' % addr
return local_hostname
def get_msgid_domain(from_): def get_msgid_domain(from_):
from email.utils import parseaddr from email.utils import parseaddr
try: try:
@ -79,29 +102,6 @@ def get_mx(host, verbose=0):
return [str(x.exchange) for x in answers if hasattr(x, 'exchange')] return [str(x.exchange) for x in answers if hasattr(x, 'exchange')]
def safe_localhost():
# 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
# instead (essentially an encoded IP address like [A.B.C.D]).
fqdn = socket.getfqdn()
if '.' in fqdn:
# Some mail servers have problems with non-ascii local hostnames, see
# https://bugs.launchpad.net/bugs/1256549
try:
local_hostname = idna.ToASCII(force_unicode(fqdn))
except:
local_hostname = 'localhost.localdomain'
else:
# We can't find an fqdn hostname, so use a domain literal
addr = '127.0.0.1'
try:
addr = socket.gethostbyname(socket.gethostname())
except socket.gaierror:
pass
local_hostname = '[%s]' % addr
return local_hostname
def sendmail_direct(from_, to, msg, timeout, localhost, verbose, def sendmail_direct(from_, to, msg, timeout, localhost, verbose,
debug_output=None): debug_output=None):
import calibre.utils.smtplib as smtplib import calibre.utils.smtplib as smtplib