Updated dependencies, fixed file upload and pypi setup

elbuo8 · elbuo8 · commit 3d29cf7169c4 · 2013-12-24T01:02:30.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
+build
+dist
+sdist
+*.egg
+*.egg-info
 *.pyc
 venv/
diff --git a/sendgrid/__init__.py b/sendgrid/__init__.py
@@ -0,0 +1,2 @@
+from sendgrid import SendGridClient
+from message import Mail
diff --git a/sendgrid/header.py b/sendgrid/header.py
diff --git a/sendgrid/message.py b/sendgrid/message.py
@@ -1,6 +1,7 @@
+import io
 import rfc822
 import base64
-from header import SMTPAPIHeader
+from smtpapi import SMTPAPIHeader
 
 
 class Mail(SMTPAPIHeader):
@@ -102,7 +103,13 @@ def add_attachment(self, name, filepath):
             file: path to file or data string
 
         """
-        self.files[name] = base64.urlsafe_b64encode(open(filepath, "rb").read())
+        self.files[name] = open(filepath, "rb").read()
+
+    def add_attachment_stream(self, name, string):
+        if isinstance(string, str):
+            self.files[name] = string
+        elif isinstance(string, io.BytesIO):
+            self.files[name] = string.read()
 
     def set_headers(self, headers):
         self.headers = headers
diff --git a/sendgrid/sendgrid.py b/sendgrid/sendgrid.py
@@ -1,11 +1,10 @@
 import requests
-import urllib
 
 class SendGridClient(object):
     """
     SendGrid API
     """
-    def __init__(self, username, password):
+    def __init__(self, username, password, **opts):
         """
         Construct Sendgrid API object
 
@@ -17,6 +16,7 @@ def __init__(self, username, password):
         self.username = username
         self.password = password
         self.mailUrl = 'https://api.sendgrid.com/api/mail.send.json'
+        self.proxies = opts.get('proxies', None)
 
     def send(self, message):
       values = {}
@@ -34,8 +34,5 @@ def send(self, message):
       for filename in message.files:
         values['files[' + filename + ']'] = message.files[filename]
       values['x-smtpapi'] = str(message.api_header_as_json())
-      print values
-      r = requests.get(self.mailUrl,params=values)
-      print
-      print r.url
-      return r.text
+      r = requests.get(self.mailUrl, params=values, proxies=self.proxies)
+      return r.status_code, r.json()
diff --git a/setup.py b/setup.py
@@ -2,12 +2,16 @@
 
 setup(
     name='sendgrid',
-    version='0.1.4',
+    version='0.2.0',
     author='Yamil Asusta',
     author_email='yamil@sendgrid.com',
-    packages=find_packages(),
     url='https://github.com/sendgrid/sendgrid-python/',
+    packages=find_packages(),
     license='LICENSE.txt',
     description='SendGrid library for Python',
     long_description='SendGrid library for Python',
+    install_requires=[
+        'requests',
+        'smtpapi'
+    ],
 )
diff --git a/test/main_test.py b/test/main_test.py
@@ -0,0 +1,10 @@
+import os
+from sendgrid import SendGridClient, Mail
+
+sg = SendGridClient(os.getenv('SG_USER'), os.getenv('SG_PWD'))
+m = Mail(to=['yamil.asusta@upr.edu'])
+m.set_from('yamil@sendgrid.com')
+m.set_subject('JAJA')
+m.set_text('fail')
+m.add_attachment_stream('test.txt', 'Testing them string bro')
+print str(sg.send(m))

-Original file line number
+Diff line change
@@ @@ -1,2 +1,7 @@ @@
 +build
 +dist
 +sdist
 +*.egg
 +*.egg-info
 *.pyc
 venv/
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+from sendgrid import SendGridClient`
	`2`	`+from message import Mail`