Merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 08:37:29 +01:00
commit cadc3fdcb5
59 changed files with 208 additions and 208 deletions

4
Doc/includes/email-alternative.py Normal file → Executable file
View file

@ -17,14 +17,14 @@ msg['From'] = me
msg['To'] = you
# Create the body of the message (a plain-text and an HTML version).
text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttp://www.python.org"
text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org"
html = """\
<html>
<head></head>
<body>
<p>Hi!<br>
How are you?<br>
Here is the <a href="http://www.python.org">link</a> you wanted.
Here is the <a href="https://www.python.org">link</a> you wanted.
</p>
</body>
</html>