Skip to content

SendRawEmail Support + HTTPLib2 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richieforeman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SendRawEmail Support + HTTPLib2 #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions amazon_ses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#Copyright (c) 2011 Vladimir Pankratiev http://tagmask.com
#Copyright (c) 2011 Vladimir Pankratiev http://tagmask.com
# Additional development by Richie Foreman <[email protected]>
#
#Permission is hereby granted, free of charge, to any person obtaining a copy
#of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,14 +19,17 @@
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
#THE SOFTWARE.

import httplib
import urllib
import hashlib
import hmac
import logging
import base64
from datetime import datetime
from xml.etree.ElementTree import XML
import httplib2

http = httplib2.Http()
SES_URI = "https://email.us-east-1.amazonaws.com"

log = logging.getLogger(__name__)

Expand All @@ -51,15 +55,12 @@ def _getHeaders(self):
def _performAction(self, actionName, params=None):
if not params:
params = {}
params['Action'] = actionName
#https://email.us-east-1.amazonaws.com/
conn = httplib.HTTPSConnection('email.us-east-1.amazonaws.com')
params = urllib.urlencode(params)
conn.request('POST', '/', params, self._getHeaders())
response = conn.getresponse()
responseResult = response.read()
conn.close()
return self._responseParser.parse(actionName, response.status, response.reason, responseResult)
params['Action'] = actionName
response, content = http.request(uri=SES_URI,
method="POST",
body=urllib.urlencode(params),
headers=self._getHeaders())
return self._responseParser.parse(actionName, response.status, response.reason, content)

def verifyEmailAddress(self, emailAddress):
params = { 'EmailAddress': emailAddress }
Expand All @@ -77,7 +78,10 @@ def getSendStatistics(self):

def listVerifiedEmailAddresses(self):
return self._performAction('ListVerifiedEmailAddresses')


def sendRawEmail(self, rawMessage):
return self._performAction("SendRawEmail", params={"RawMessage.Data": base64.b64encode(rawMessage)})

def sendEmail(self, source, toAddresses, message, replyToAddresses=None, returnPath=None, ccAddresses=None, bccAddresses=None):
params = { 'Source': source }
for objName, addresses in zip(["ToAddresses", "CcAddresses", "BccAddresses"], [toAddresses, ccAddresses, bccAddresses]):
Expand Down Expand Up @@ -229,7 +233,7 @@ def _parseListVerifiedEmails(self, actionName, xmlResponse):
def _parseSendEmail(self, actionName, xmlResponse):
if xmlResponse.checkActionName(actionName):
requestId = xmlResponse.getChildText('ResponseMetadata', 'RequestId')
messageId = xmlResponse.getChildText('SendEmailResult', 'MessageId')
messageId = xmlResponse.getChildText('%sResult' % actionName, 'MessageId')
return AmazonSendEmailResult(requestId, messageId)

def _raiseError(self, xmlResponse):
Expand All @@ -250,7 +254,7 @@ def parse(self, actionName, statusCode, reason, responseResult):
else:
if actionName in self._simpleResultActions:
result = self._parseSimpleResult(actionName, xmlResponse)
elif actionName in ['SendEmail']:
elif actionName in ['SendEmail', "SendRawEmail"]:
result = self._parseSendEmail(actionName, xmlResponse)
elif actionName == 'GetSendQuota':
result = self._parseSendQuota(actionName, xmlResponse)
Expand Down