Merge pull request #88 from cbg/small_conditional_fix

Small conditional clean-up

Author: Yamil Asusta

sendgrid/message.py

@@ -131,11 +131,9 @@ def add_attachment(self, name, file_):
     def add_attachment_stream(self, name, string):
         if sys.version_info < (3, 0) and isinstance(name, unicode):
             name = name.encode('utf-8')
-        if isinstance(string, str):
-            self.files[name] = string
-        elif isinstance(string, io.BytesIO):
+        if isinstance(string, io.BytesIO):
             self.files[name] = string.read()
-        elif sys.version_info < (3, 0) and isinstance(string, unicode):
+        else:
             self.files[name] = string
 
     def add_content_id(self, cid, value):