innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,394 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

51 Commits

Author SHA1 Message Date
Luke Plant 9294121d3c Fixed #9367 - EmailMultiAlternatives does not properly handle attachments. 
Thanks to Loek Engels for the bulk of the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-12 13:56:40 +00:00
Jacob Kaplan-Moss 8ada8d7c03 Fixed #9214: EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-16 20:47:39 +00:00
Malcolm Tredinnick e3aa9a2828 Fixed #9383 -- Don't open a network connection for sending email if there's 
nothing to send. Saves a bit of time when, for example, processing 500-error
emails with no ADMINs configured. Based on a patch from Jesse Young.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-24 04:38:43 +00:00
Malcolm Tredinnick 70b6c4c015 Fixed #9233 -- Allow date and message-id headers to be passed in manually in 
email messages. Previously we were creating duplicate headers, which was bad.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-07 12:20:01 +00:00
Russell Keith-Magee 0f869f905e Fixed #7747: Altered EmailMessage such that messages with long subject lines don't use tabs in their continutation sequence. Tabs in subjects cause problems with Outlook and Thunderbird. Thanks to Mark Allison <mark.allison@maplecroft.com> for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 13:31:28 +00:00
Malcolm Tredinnick 319a31464d Fixed #7966 -- Send email if it has "bcc" recipients and no "to" recipients. 
Patch from Zal.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 04:10:52 +00:00
Malcolm Tredinnick f49c5c23f9 Fixed #7574 -- Fixed the handling of lazy translation in email headers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 03:37:25 +00:00
Adrian Holovaty f19284b85a Fixed #7655 -- Added two assertions to mail.py to help people debug a common problem (sending strings instead of lists/tuples for 'to' or 'bcc'). Thanks, guettli 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-08 01:56:01 +00:00
Gary Wilson Jr f3b48a21fb Fixed some styling issues in `django/core/mail.py`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-21 21:52:34 +00:00
Gary Wilson Jr 6e2c677ef9 Noted an additional modification we have made to `make_msgid`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-21 21:39:50 +00:00
Gary Wilson Jr c364b6b361 Fixed #6835 -- Use cached FQDN when creating `smtplib.SMTP()` connection to avoid a lengthy 
`socket.getfqdn()` call, thanks George Murdocca and PhiR.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-21 21:08:39 +00:00
Gary Wilson Jr 1e23ad0b65 Fixed #6841 -- Don't include bcc recepients in e-mail headers, thanks PhiR. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-21 20:35:39 +00:00
Malcolm Tredinnick d5d2072bbf Updated a docstring on a couple of email functions to stop the complaints. 
It's deprecated for internal use, but the functions still exist.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-29 17:00:35 +00:00
Adrian Holovaty 5496c50b62 Fixed #6299 -- Fixed an indentation error in django/core/mail.py introduced in [6987] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-02 08:39:03 +00:00
Adrian Holovaty 1264bcf8b0 Fixed #5887 -- Consolidated some duplicate code in SafeMIMEText and SafeMIMEMultipart. Thanks, Carl Karsten 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-02 05:29:10 +00:00
Malcolm Tredinnick c506f4574a Fixed #6139 -- When sending email, made sure that the "to" and "bcc" sequences have the same type before concatenating. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-19 04:51:35 +00:00
Malcolm Tredinnick a0fdd7c7dd Fixed #5778 -- Changed the way we detect if a string is non-ASCII when creating 
email headers. This fixes a problem that was showing up on some (but not all)
systems.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-20 07:53:54 +00:00
Malcolm Tredinnick cd8959c82a Fixed #5486 -- Worked around the lack of os.getpid() in Jython, whilst still using it for CPython. Patch from Leo Soto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 09:51:41 +00:00
Malcolm Tredinnick 1777e74d2a Fixed #4910 -- Allow Unicode content to be passed in for text-based e-mail 
attachments. Thanks, djoume@taket.org.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-11 12:10:07 +00:00
Malcolm Tredinnick 8f96bd2c72 Fixed #4781 -- Typo fix. Pointed out by Simon Litchfield. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-06 06:53:27 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Malcolm Tredinnick 1b1379a182 Backported the fix from [5581] (unicode-branch) to trunk. Fixes a method 
resolution order problem when setting email headers.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-01 06:32:34 +00:00
Malcolm Tredinnick eeb4ffc2c1 Fixed #2007 -- Added support for configurable encoding of email message bodies. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-27 12:54:15 +00:00
Malcolm Tredinnick 987f8aa257 Fixed #3985 -- Added support for custom email headers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-27 12:41:37 +00:00
Malcolm Tredinnick 719a90391d Added support for creating multipart/alternative email messages. Also allow 
tweaking of main body MIME subtype for brave people. Fixed #3605.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-27 12:18:05 +00:00
Malcolm Tredinnick 2d082a34dc Fixed #1541 -- Added ability to create multipart email messages. Thanks, Nick 
Lane.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-27 09:44:55 +00:00
Malcolm Tredinnick 5ff1d96a52 Fixed #3307 -- Added BCC support to the EmailMessage class. En-passant, fixed a 
number of RST formatting errors in the email docs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 14:38:45 +00:00
Malcolm Tredinnick bc6535b599 Minor edit of initialisation logic. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 13:53:42 +00:00
Malcolm Tredinnick 7a84ad93e6 Fixed #2897 -- Added support for TLS connections to email handling. This means 
servers like Google's SMTP server can now be used for admin emails.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 13:35:02 +00:00
Malcolm Tredinnick 21a2ca6a21 Fixed #3472 -- Don't BASE64-encode UTF-8 (or ASCII) email messages. 
Patch from smurf@smurf.noris.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 12:08:31 +00:00
Malcolm Tredinnick befbd82d85 Fixed bozo error in [5141]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 11:50:43 +00:00
Malcolm Tredinnick 95d7cb27d0 Fixed #3366 -- Part 1 of the email code refactoring and feature extension. This 
part refactors email sending into a more object-oriented interface in order to
make adding new features possible without making the API unusable. Thanks to
Gary Wilson for doing the design thinking and initial coding on this.

Includes documentation addition, but it probably needs a rewrite/edit, since
I'm not very happy with it at the moment.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-03 11:35:11 +00:00
Malcolm Tredinnick fe24ddbfcb Fixed #4086 -- Removed some redundant code points out by Ilya Semenov. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-20 09:59:44 +00:00
Jacob Kaplan-Moss 3468fd01a9 Fixed #3488: send_mail no longer uses settings in function default arguments. Thanks to Per Jonsson for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-25 16:29:09 +00:00
Jacob Kaplan-Moss 8546521d9b Fixed #3554: django.core.mail now generates dates with the email module instead of the outdated rfc822 module. Thanks, real.human@mrmachine.net 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-25 15:55:31 +00:00
Malcolm Tredinnick f5ede9c5c8 Fixed #3067 -- Improved caching of machine hostname to increase server restart 
times. Thanks SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-17 06:01:17 +00:00
Adrian Holovaty 83c40fb922 Fixed bug in [4058], in django/core/mail.py. Thanks, Igor Goryachev 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-10 17:42:47 +00:00
Adrian Holovaty 4b4efced54 Fixed #3007 -- Fixed Python 2.4-ism from [4051] in django/core/mail.py. Also cached the result of socket.getfqdn(). Thanks for the patch, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-10 03:28:58 +00:00
Adrian Holovaty a84404c190 Formatting fixes from the past round of checkins 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 19:07:27 +00:00
Jacob Kaplan-Moss 6f164ad485 Fixed #2991: Added Message-ID header to messages sent from Django. Thanks, Graham King. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 15:32:18 +00:00
Adrian Holovaty f375b54503 Fixed #1634 -- Changed django.core.mail to include 'Date' header in e-mails. Thanks, Eric Walstad 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-26 04:40:48 +00:00
Jacob Kaplan-Moss aa11b3ea50 Fixed #1235: email sent from {{{django.core.mail}}} will now be encoded using 
the value of the {{{DEFAULT_CHARSET}}} setting. Thanks, igor@goryachev.org and akaihola.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@2901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-13 17:18:42 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Adrian Holovaty 8d70ed4b25 Fixed #1555 -- Added EMAIL_PORT setting. Thanks, bde3 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-11 03:23:03 +00:00
Adrian Holovaty cd7dbd8f00 Converted django.core.mail to use 'from django.conf import settings' instead of importing specific settings directly 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-04-11 03:19:57 +00:00
Adrian Holovaty fe24eca81a Fixed #1529 -- Added support for authenticated SMTP to django.core.mail. Thanks, Bruce Kroeze 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-03-22 19:47:15 +00:00
Adrian Holovaty 528b4ebd8d Fixed #1139 -- Changed django.core.mail to raise BadHeaderError (a subclass of ValueError) and changed docs/email.txt example to use that 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-29 22:12:54 +00:00
Adrian Holovaty 8b5c2192e8 Fixed #1135 -- Changed django.core.mail functions not to allow newlines in headers 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-12-29 20:33:56 +00:00
Jacob Kaplan-Moss 2d1303bd68 Added EMAIL_SUBJECT_PREFIX setting so you can customize the "[Django]" prefix 
on emails send with mail_admins/mail_managers.  Refs #568.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-27 16:32:21 +00:00
Adrian Holovaty eb9c9ab4d0 Changed django.core.mail to use [Django] prefix instead of [CMS] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@54 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-07-15 16:47:19 +00:00