Preparing for merge into master

Author: thinkingserious

.travis.yml

@@ -7,7 +7,6 @@ install:
 - python setup.py install
 script: 
 - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then unit2 discover; else python -m unittest discover; fi
-                                                                                                     
 notifications:
   hipchat:
     rooms:

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.4.3] - 2015-10-22
+### Fixed
+- Reply To header now supports friendly name [#110](https://github.com/sendgrid/sendgrid-python/issues/110)
+
+## [1.4.2] - 2015-09-15
+### Added
+- Upgrade Mail to new-style class, on Python 2.x.
+
 ## [1.4.1] - 2015-09-09
 ### Added
 - Classifiers for compatible python versions

README.rst

@@ -12,6 +12,15 @@ Warning
 
 If you upgrade to version ``1.2.x``, the ``add_to`` method behaves differently. In the past this method defaulted to using the ``SMTPAPI`` header. Now you must explicitly call the ``smtpapi.add_to`` method. More on the ``SMTPAPI`` section.
 
+Announcements
+-------------
+
+For users of our `Web API v3 endpoints`_, we have begun integrating v3 endpoints into this library. As part of this process we have implemented a test automation tool, TOX_. We are also updating and enhancing the core library code.
+
+In no particular order, we have implemented a few of the v3 endpoints already and would appreciate your feedback. Please feel free to submit issues and pull requests on the `v3_beta branch`_. 
+
+Thank you for your continued support! 
+
 Install
 -------
 
@@ -504,3 +513,6 @@ MIT License
 .. _Category: http://sendgrid.com/docs/Delivery_Metrics/categories.html
 .. _Unique Arguments: http://sendgrid.com/docs/API_Reference/SMTP_API/unique_arguments.html
 .. _Filter: http://sendgrid.com/docs/API_Reference/SMTP_API/apps.html
+.. _`Web API v3 endpoints`: https://sendgrid.com/docs/API_Reference/Web_API_v3/index.html
+.. _TOX: https://testrun.org/tox/latest/
+.. _`v3_beta branch`: https://github.com/sendgrid/sendgrid-python/tree/v3_beta

sendgrid/message.py

@@ -43,9 +43,11 @@ def __init__(self, **opts):
         self.html = opts.get('html', '')
         self.bcc = []
         self.add_bcc(opts.get('bcc', []))
-        self.reply_to = opts.get('reply_to', '')
+        self.reply_to = ''
+        self.set_replyto(opts.get('reply_to', ''))
         self.files = opts.get('files', {})
-        self.set_headers(opts.get('headers', ''))
+        self.headers = {}
+        self.set_headers(opts.get('headers', {}))
         self.date = opts.get('date', rfc822.formatdate())
         self.content = opts.get('content', {})
         self.smtpapi = opts.get('smtpapi', SMTPAPIHeader())
@@ -123,7 +125,18 @@ def add_bcc(self, bcc):
                 self.add_bcc(email)
 
     def set_replyto(self, replyto):
-        self.reply_to = replyto
+        name, email = rfc822.parseaddr(replyto.replace(',', ''))
+        if name and email:
+            self.set_reply_to_name(replyto)
+        elif email:
+            self.reply_to = email
+
+    def set_reply_to_name(self, replyto):
+        headers = {
+            "Reply-To":  replyto
+        }
+        self.reply_to = ''
+        self.set_headers(headers)
 
     def add_attachment(self, name, file_):
         if sys.version_info < (3, 0) and isinstance(name, unicode):
@@ -146,10 +159,14 @@ def add_content_id(self, cid, value):
         self.content[cid] = value
 
     def set_headers(self, headers):
+        if sys.version_info < (3, 0) and isinstance(headers, unicode):
+            headers = headers.encode('utf-8')
+        if isinstance(self.headers, str):
+            self.headers = json.loads(self.headers)
         if isinstance(headers, str):
-            self.headers = headers
-        else:
-            self.headers = json.dumps(headers)
+            headers = json.loads(headers)
+        for key, value in headers.items():
+            self.headers[key] = value
 
     def set_date(self, date):
         self.date = date

sendgrid/sendgrid.py

@@ -1,4 +1,5 @@
 import sys
+import json
 from socket import timeout
 from .version import __version__
 try:
@@ -71,7 +72,7 @@ def _build_body(self, message):
             'text': message.text,
             'html': message.html,
             'replyto': message.reply_to,
-            'headers': message.headers,
+            'headers': json.dumps(message.headers) if message.headers else '',
             'date': message.date,
             'x-smtpapi': message.json_string()
         }

sendgrid/version.py

@@ -1,2 +1,2 @@
-version_info = (1, 4, 1)
+version_info = (1, 5, 3)
 __version__ = '.'.join(str(v) for v in version_info)