Merge branch 'master' of https://github.com/sendgrid/sendgrid-python

Author: elbuo8

README.rst

@@ -167,6 +167,14 @@ set_date
 
     message = sendgrid.Mail()
     message.set_date('Wed, 17 Dec 2014 19:21:16 +0000')
+    
+set_headers
+^^^^^^^^^^^
+
+.. code:: python
+
+    message = sendgrid.Mail()
+    message.set_headers({'X-Sent-Using': 'SendGrid-API', 'X-Transport': 'web'});
 
 Set File Attachments
 ~~~~~~~~~~~~~~~~~~~~

setup.py

@@ -8,9 +8,9 @@
 
 def getRequires():
     deps = ['smtpapi==0.1.3']
-    if sys.version_info < (3, 0):
+    if sys.version_info < (2, 7):
         deps.append('unittest2')
-    else:
+    elif (3, 0) <= sys.version_info < (3, 2):
         deps.append('unittest2py3k')
     return deps
 

test/__init__.py

@@ -1,5 +1,8 @@
 import os
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import json
 import sys
 try: