mirror of
https://github.com/DarrenOfficial/dpaste.git
synced 2024-12-19 00:09:21 +11:00
No need for a sendmail compatible smtp anymore.
This commit is contained in:
parent
1d6fea38c4
commit
e3de35fa15
3 changed files with 3 additions and 58 deletions
|
@ -19,4 +19,4 @@ DATABASES = {
|
|||
|
||||
SECRET_KEY = 'changeme'
|
||||
|
||||
EMAIL_BACKEND = 'dpaste.smtp.EmailBackend'
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
|
|
|
@ -1,57 +0,0 @@
|
|||
"""sendmail email backend class."""
|
||||
|
||||
import threading
|
||||
|
||||
from django.core.mail.backends.base import BaseEmailBackend
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
|
||||
class EmailBackend(BaseEmailBackend):
|
||||
"""
|
||||
EmailBackend that uses a local 'sendmail' binary instead of a local
|
||||
SMTP daemon.
|
||||
"""
|
||||
def __init__(self, fail_silently=False, **kwargs):
|
||||
super(EmailBackend, self).__init__(fail_silently=fail_silently)
|
||||
self._lock = threading.RLock()
|
||||
|
||||
def open(self):
|
||||
return True
|
||||
|
||||
def close(self):
|
||||
pass
|
||||
|
||||
def send_messages(self, email_messages):
|
||||
"""
|
||||
Sends one or more EmailMessage objects and returns the number of email
|
||||
messages sent.
|
||||
"""
|
||||
if not email_messages:
|
||||
return
|
||||
self._lock.acquire()
|
||||
try:
|
||||
num_sent = 0
|
||||
for message in email_messages:
|
||||
sent = self._send(message)
|
||||
if sent:
|
||||
num_sent += 1
|
||||
finally:
|
||||
self._lock.release()
|
||||
return num_sent
|
||||
|
||||
def _send(self, email_message):
|
||||
"""A helper method that does the actual sending."""
|
||||
if not email_message.recipients():
|
||||
return False
|
||||
try:
|
||||
ps = Popen(["sendmail"]+list(email_message.recipients()), \
|
||||
stdin=PIPE)
|
||||
ps.stdin.write(email_message.message().as_string())
|
||||
ps.stdin.flush()
|
||||
ps.stdin.close()
|
||||
return not ps.wait()
|
||||
except:
|
||||
if not self.fail_silently:
|
||||
raise
|
||||
return False
|
||||
return True
|
|
@ -1,5 +1,7 @@
|
|||
from django.conf.urls.defaults import url, patterns
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = patterns('dpaste.views',
|
||||
url(r'^$', 'snippet_new', name='snippet_new'),
|
||||
url(r'^guess/$', 'guess_lexer', name='snippet_guess_lexer'),
|
||||
|
|
Loading…
Reference in a new issue