Fixing merge conflicts

Author: thinkingserious

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.5.15] - 2015-11-17 ##
+
+### Added ###
+
+- API Keys documentation for [POST, PATCH, DELETE]
+
+## [1.5.14] - 2015-11-09 ##
+
+### Fixed ###
+- Fix "Mail uses old-style class again" [144](https://github.com/sendgrid/sendgrid-python/issues/144)
+
 ## [1.5.13] - 2015-10-28 ##
 
 ### Fixed ###

README.rst

@@ -248,6 +248,29 @@ List all API Keys belonging to the authenticated user.
     client = sendgrid.SendGridAPIClient('SENDGRID_API_KEY')
     status, msg = client.apikeys.get()
     
+Generate a new API Key for the authenticated user
+
+.. code:: python
+
+    client = sendgrid.SendGridAPIClient(os.environ.get('SENDGRID_API_KEY'))
+    name = "My Amazing API Key"
+    status, msg = client.apikeys.post(name)
+    
+Revoke an existing API Key
+
+.. code:: python
+
+    client = sendgrid.SendGridAPIClient(os.environ.get('SENDGRID_API_KEY'))
+    status, msg = client.apikeys.delete(api_key_id)
+    
+Update the name of an existing API Key
+
+.. code:: python
+
+    client = sendgrid.SendGridAPIClient(os.environ.get('SENDGRID_API_KEY'))
+    name = "My NEW API Key 3000"
+    status, msg = client.apikeys.patch(api_key_id, name)
+    
 `Suppression Management`_
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

example_v2_test.py

@@ -9,7 +9,6 @@
 sg = sendgrid.SendGridClient(os.environ.get('SENDGRID_API_KEY'))
 
 """
-
 # Basic Send Example
 
 message = sendgrid.Mail()
@@ -26,7 +25,7 @@
 
 message = sendgrid.Mail()
 message.add_substitution(':first_name', 'John')
-message.smtpapi.add_to('Elmer Thomas <example@example.com>')
+message.smtpapi.add_to('John Doe <example@example.com>')
 message.set_subject('Testing from the Python library using the SMTPAPI')
 message.set_html('<b>:first_name, this was a successful test of using the SMTPAPI library!</b>')
 message.set_text(':name, this was a successful test of using the SMTPAPI library!')
@@ -36,19 +35,19 @@
 print msg
 
 # Template Engine Example
-#   In the template editor, the subject is <%subject%> and the body is:
+#    In the template editor, the subject is <%subject%> and the body is:
 #
-#   Hello :name,
+#    Hello :name,
 #   
-#   <%body%>
+#    <%body%>
 #
-#   With Best Regards,
+#    With Best Regards,
 # 
-#   Your Library Tester
+#    Your Library Tester
 # 
-#  <%subject%> is replaced with the value in message.set_subject
-#  <%body%> is replaced with the value in message.set_html and message.set_text
-#  :name is replaced with the value in message.add_substitution
+#    <%subject%> is replaced with the value in message.set_subject
+#    <%body%> is replaced with the value in message.set_html and message.set_text
+#    :name is replaced with the value in message.add_substitution
 
 message = sendgrid.Mail()
 message.add_filter('templates', 'enable', '1')

example_v3_test.py

@@ -11,8 +11,7 @@
 client = sendgrid.SendGridAPIClient(os.environ.get('SENDGRID_API_KEY'))
 
 """
-
-email = 'elmer.thomas+test_global0@gmail.com'
+email = 'example@example.com'
 status, msg = client.asm_global_suppressions.delete(email)
 print status
 print msg
@@ -21,7 +20,7 @@
 print status
 print msg
 
-status, msg = client.asm_global_suppressions.post(['elmer.thomas+test_global0@gmail.com'])
+status, msg = client.asm_global_suppressions.post(['example@example.com'])
 print status
 print msg
 
@@ -47,24 +46,24 @@
 print msg
 
 # In the global suppression list
-status, msg = client.asm_global_suppressions.get('elmer.thomas+test_global@gmail.com')
+status, msg = client.asm_global_suppressions.get('example@example.com')
 print status
 print msg
 
 # Not in the global suppression list
-status, msg = client.asm_global_suppressions.get('elmer.thomas@gmail.com')
+status, msg = client.asm_global_suppressions.get('example@example.com')
 print status
 print msg
 
 status, msg = client.apikeys.get()
 print status
 print msg
 
-status, msg = client.asm_suppressions.delete(67,'elmer+test@thinkingserious.com')
+status, msg = client.asm_suppressions.delete(67,'example@example.com')
 print status
 print msg
 
-status, msg = client.asm_suppressions.post(60, ['elmer+test@thinkingserious.com', 'elmer.thomas@yahoo.com'])
+status, msg = client.asm_suppressions.post(60, ['example@example.com', 'example@example.com])
 print status
 print msg
 

sendgrid/message.py

@@ -8,7 +8,7 @@
 from smtpapi import SMTPAPIHeader
 
 
-class Mail():
+class Mail(object):
 
     """SendGrid Message."""
 

sendgrid/version.py

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