From 68a1017f412c5eb92de0486c4b59be0992faf2b2 Mon Sep 17 00:00:00 2001
From: Vraj Mohan <vrajm@aweber.com>
Date: Thu, 20 Nov 2014 09:12:17 -0500
Subject: [PATCH] Remove embedded CA certificate, upgrade httplib2

PAPI-175
The workaround of embedding the CA certificate is no longer needed.
It needs to be removed as it does not work with our new SSL certs.
---
 CHANGELOG.rst         |  4 ++++
 MANIFEST.in           |  1 -
 aweber_api/cacert.crt | 20 --------------------
 aweber_api/oauth.py   |  1 -
 setup.py              |  4 ++--
 5 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 aweber_api/cacert.crt

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e045fd6..a4aa867 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,9 @@
 Changelog
 ---------
+2014-11-20 v1.2.1
+  * Removed SSL Certificate workaround
+  * Upgraded httplib2 >= 0.9.0
+
 2014-11-13: v1.2.0
    * Add a new endpoint to schedule broadcast
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 551b252..db9b08b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
 include *.py
 include *.rst
-include aweber_api/cacert.crt
 include LICENSE
diff --git a/aweber_api/cacert.crt b/aweber_api/cacert.crt
deleted file mode 100644
index bcb2529..0000000
--- a/aweber_api/cacert.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
diff --git a/aweber_api/oauth.py b/aweber_api/oauth.py
index 1fe3003..2c3cbde 100644
--- a/aweber_api/oauth.py
+++ b/aweber_api/oauth.py
@@ -82,7 +82,6 @@ def _get_client(self):
         else:
             client = oauth.Client(self.consumer)
 
-        client.ca_certs = os.path.join(os.path.dirname(__file__), 'cacert.crt')
         return client
 
     def _prepare_request_body(self, method, url, data):
diff --git a/setup.py b/setup.py
index 6c19d05..c903a16 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='aweber_api',
-    version='1.2.0',
+    version='1.2.1',
     author='AWeber Dev Team',
     author_email='api@aweber.com',
     maintainer='AWeber API Team',
@@ -28,7 +28,7 @@
     ],
     packages=find_packages(exclude=['tests']),
     install_requires=[
-        'httplib2>=0.7.0,<=0.8.0',
+        'httplib2>=0.9.0,<=0.10.0',
         'oauth2>=1.2',
     ],
     tests_require=[