sendgrid · hugovk · Oct 1, 2018 · Oct 1, 2018 · Oct 1, 2018 · Oct 1, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 sudo: false
 cache: pip
 python:
-- '2.6'
 - '2.7'
 - '3.4'
 - '3.5'
@@ -11,7 +10,6 @@ env:
   global:
     - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN
 install:
-- if [[ $TRAVIS_PYTHON_VERSION == 2.6* ]]; then pip install unittest2; fi
 - python setup.py install
 - pip install pyyaml
 - pip install flask
@@ -30,7 +28,7 @@ before_script:
 - chmod +x ./cc-test-reporter
 - ./cc-test-reporter before-build
 script:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then coverage run -m unittest2 discover; else coverage run -m unittest discover; fi
+- coverage run -m unittest discover
 after_script:
 - codecov
 - ./cc-test-reporter after-build --exit-code $?

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ You can use our Docker image to avoid setting up the development environment you
 
 ##### Prerequisites #####
 
-- Python 2.6 through 3.6
+- Python 2.7 and 3.4+
 - [python_http_client](https://github.com/sendgrid/python-http-client)
 
 ##### Initial setup: #####
@@ -122,12 +122,6 @@ All test files are in the [`test`](https://github.com/sendgrid/sendgrid-python/t
 
 For the purposes of contributing to this repo, please update the [`test_sendgrid.py`](https://github.com/sendgrid/sendgrid-python/tree/master/test/test_sendgrid.py) file with unit tests as you modify the code.
 
-For Python 2.6.*:
-
-`unit2 discover -v`
-
-For Python 2.7.* and up:
-
 `python -m unittest discover -v`
 
 ### Testing Multiple Versions of Python
@@ -149,7 +143,6 @@ You can install it by yourself in user dir by calling `source test/prism.sh`.
 Add ```eval "$(pyenv init -)"``` to your shell environment (.profile, .bashrc, etc) after installing tox, you only need to do this once.
 
 ```
-pyenv install 2.6.9
 pyenv install 2.7.11
 pyenv install 3.4.3
 pyenv install 3.5.0
@@ -159,7 +152,7 @@ Make sure to change the current working directory to your local version of the r
 python setup.py install
 ```
 ```
-pyenv local 3.5.0 3.4.3 2.7.11 2.6.9
+pyenv local 3.5.0 3.4.3 2.7.11
 pyenv rehash
 ```
 

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ We appreciate your continued support, thank you!
 
 ## Prerequisites
 
-- Python version 2.6, 2.7, 3.4, 3.5 or 3.6
+- Python version 2.7 and 3.4+
 - The SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-python)
 
 ## Setup Environment Variables

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:xenial
-ENV PYTHON_VERSIONS='python2.6 python2.7 python3.4 python3.5 python3.6' \
+ENV PYTHON_VERSIONS='python2.7 python3.4 python3.5 python3.6' \
     OAI_SPEC_URL="https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json"
 
 ARG SENDGRID-PYTHON_VERSION

diff --git a/examples/accesssettings/accesssettings.py b/examples/accesssettings/accesssettings.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/alerts/alerts.py b/examples/alerts/alerts.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/apikeys/apikeys.py b/examples/apikeys/apikeys.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/asm/asm.py b/examples/asm/asm.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/browsers/browsers.py b/examples/browsers/browsers.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/campaigns/campaigns.py b/examples/campaigns/campaigns.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/categories/categories.py b/examples/categories/categories.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/clients/clients.py b/examples/clients/clients.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/contactdb/contactdb.py b/examples/contactdb/contactdb.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/devices/devices.py b/examples/devices/devices.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/geo/geo.py b/examples/geo/geo.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/helpers/mail_example.py b/examples/helpers/mail_example.py
@@ -221,7 +221,7 @@ def send_kitchen_sink():
 def transactional_template_usage():
     # Assumes you set your environment variable:
     # https://github.com/sendgrid/sendgrid-python/blob/master/TROUBLESHOOTING.md#environment-variables-and-your-sendgrid-api-key
-    
+
     """
     Sample usage of dynamic (handlebars) transactional templates.
     To make this work, you should have dynamic template created within your

diff --git a/examples/helpers/stats/stats_example.py b/examples/helpers/stats/stats_example.py
@@ -39,12 +39,13 @@ def build_category_stats_sums():
 
 
 def build_subuser_stats():
-    subuser_stats = SubuserStats('2017-10-20', ['aaronmakks','foo'])
+    subuser_stats = SubuserStats('2017-10-20', ['aaronmakks', 'foo'])
     # subuser_stats.start_date = '2017-10-15'
     # subuser_stats.add_subuser(Subuser("foo"))
     # subuser_stats.add_subuser(Subuser("bar"))
     return subuser_stats.get()
 
+
 def build_subuser_stats_sums():
     subuser_stats = SubuserStats()
     subuser_stats.start_date = '2017-10-15'
@@ -92,6 +93,7 @@ def get_subuser_stats_sums():
     print(response.headers)
     pprint_json(response.body)
 
+
 get_global_stats()
 get_category_stats()
 get_category_stats_sums()

diff --git a/examples/ips/ips.py b/examples/ips/ips.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/mail/mail.py b/examples/mail/mail.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/mailboxproviders/mailboxproviders.py b/examples/mailboxproviders/mailboxproviders.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/mailsettings/mailsettings.py b/examples/mailsettings/mailsettings.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/partnersettings/partnersettings.py b/examples/partnersettings/partnersettings.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/scopes/scopes.py b/examples/scopes/scopes.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/senders/senders.py b/examples/senders/senders.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/stats/stats.py b/examples/stats/stats.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/subusers/subusers.py b/examples/subusers/subusers.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/suppression/suppression.py b/examples/suppression/suppression.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/templates/templates.py b/examples/templates/templates.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/trackingsettings/trackingsettings.py b/examples/trackingsettings/trackingsettings.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/user/user.py b/examples/user/user.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/examples/whitelabel/whitelabel.py b/examples/whitelabel/whitelabel.py
@@ -1,5 +1,4 @@
 import sendgrid
-import json
 import os
 
 

diff --git a/register.py b/register.py
@@ -17,4 +17,4 @@
               '''
 final_text = readme_rst.replace(replace, replacement)
 with open('./README.txt', 'w', encoding='utf-8') as f:
-  f.write(final_text)
+    f.write(final_text)
diff --git a/sendgrid/helpers/endpoints/ip/unassigned.py b/sendgrid/helpers/endpoints/ip/unassigned.py
@@ -23,8 +23,8 @@ def unassigned(data, as_json=False):
         unassigned returns a listing of the IP addresses that are allocated 
         but have 0 users assigned
 
-        
-        data (response.body from sg.client.ips.get()) 
+
+        data (response.body from sg.client.ips.get())
         as_json False -> get list of dicts
                 True  -> get json object
 

diff --git a/sendgrid/helpers/inbound/app.py b/sendgrid/helpers/inbound/app.py
@@ -3,13 +3,13 @@
 See README.txt for usage instructions."""
 try:
     from config import Config
-except:
+except ImportError:
     # Python 3+, Travis
     from sendgrid.helpers.inbound.config import Config
 
 try:
     from parse import Parse
-except:
+except ImportError:
     # Python 3+, Travis
     from sendgrid.helpers.inbound.parse import Parse
 

diff --git a/sendgrid/helpers/inbound/send.py b/sendgrid/helpers/inbound/send.py
@@ -3,6 +3,7 @@
 import argparse
 import sys
 from io import open
+
 try:
     from config import Config
 except ImportError:
@@ -37,6 +38,7 @@ def url(self):
         """URL to send to."""
         return self._url
 
+
 def main():
     config = Config()
     parser = argparse.ArgumentParser(description='Test data and optional host.')
@@ -54,5 +56,6 @@ def main():
     print(response.headers)
     print(response.body)
 
+
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/sendgrid/helpers/mail/content.py b/sendgrid/helpers/mail/content.py
@@ -1,5 +1,6 @@
 from .validators import ValidateAPIKey
 
+
 class Content(object):
     """Content to be included in your email.
 

diff --git a/sendgrid/helpers/mail/exceptions.py b/sendgrid/helpers/mail/exceptions.py
@@ -2,6 +2,7 @@
 # Various types of extensible SendGrid related exceptions
 ################################################################
 
+
 class SendGridException(Exception):
     """Wrapper/default SendGrid-related exception"""
     pass
@@ -14,9 +15,8 @@ class APIKeyIncludedException(SendGridException):
             message -- explanation of the error
     """
 
-    def __init__(self, 
-                 expression="Email body", 
+    def __init__(self,
+                 expression="Email body",
                  message="SendGrid API Key detected"):
         self.expression = expression
         self.message = message
-
diff --git a/sendgrid/helpers/mail/validators.py b/sendgrid/helpers/mail/validators.py
@@ -3,6 +3,7 @@
 # Various types of Validators
 ################################################################
 
+
 class ValidateAPIKey(object):
     """Validates content to ensure SendGrid API key is not present"""
 
@@ -27,9 +28,8 @@ def __init__(self, regex_strings=None, use_default=True):
             default_regex_string = 'SG\.[0-9a-zA-Z]+\.[0-9a-zA-Z]+'
             self.regexes.add(re.compile(default_regex_string))
 
-
     def validate_message_dict(self, request_body):
-        """With the JSON dict that will be sent to SendGrid's API, 
+        """With the JSON dict that will be sent to SendGrid's API,
             check the content for SendGrid API keys - throw exception if found
         Args:
             request_body (:obj:`dict`): message parameter that is
@@ -44,17 +44,16 @@ def validate_message_dict(self, request_body):
 
         # Default param
         elif isinstance(request_body, dict):
-            
+
             contents = request_body.get("content", list())
-            
+
             for content in contents:
                 if content is not None:
                     if (content.get("type") == "text/html" or
                             isinstance(content.get("value"), str)):
                         message_text = content.get("value", "")
                         self.validate_message_text(message_text)
 
-
     def validate_message_text(self, message_string):
         """With a message string, check to see if it contains a SendGrid API Key
             If a key is found, throw an exception
@@ -68,4 +67,3 @@ def validate_message_text(self, message_string):
             for regex in self.regexes:
                 if regex.match(message_string) is not None:
                     raise APIKeyIncludedException()
-