oops we didn't declare a six dependency!!

Author: jrabbit

setup.py

@@ -10,6 +10,7 @@
       description="A python client library for taskwarrior's taskd",
       license="GPL v3+",
       zip_safe=False,
+      install_requires=["six"],
       url="https://github.com/jrabbit/taskd-client-py",
       keywords=['taskwarrior', 'taskd', 'client'],
       classifiers=["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",

taskc/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.3b2"
+__version__ = "0.0.3"

taskc/simple.py

@@ -71,6 +71,10 @@ def _connect(self):
             context.load_verify_locations(cafile=self.cacert_file)
         elif self.cacert:
             print(self.cacert)  # TODO: Replace prints with logging
+            if six.PY2:
+                raise NotImplementedError
+            
+            logger.info("Got CA cert as data/string type: %s", type(self.cacert))
             context.load_verify_locations(cadata=self.cacert)
 
         # enable for non-selfsigned certs

taskc/test_simple.py

@@ -14,7 +14,7 @@
 except ImportError:
     import mock
 
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
 
 class TestRCParse(unittest.TestCase):
 
@@ -129,6 +129,19 @@ def test_put(self):
         resp = self.tc.put(tasks)
         self.assertEqual(resp.status_code, 200)
         # might not be correct depends on state of taskd
+
+    def test_cadata(self):
+        "This doesn't work in python2.7??"
+        self.tc.cacert_file = False
+        with open("taskc/fixture/pki/ca.cert.pem") as ca:
+            self.tc.cacert = ca.read()
+        self.tc._connect()
+        # print self.tc.conn.getpeername()
+        self.assertEqual(self.tc.conn.getpeername(), ('127.0.0.1', self.tc.port))
+        # make sure we're on TLS v2 per spec
+        self.assertEqual(self.tc.conn.context.protocol, 2)
+        self.tc.conn.close()
+
     def tearDown(self):
         print(self.docker.logs(self.container['Id'], stdout=True, stderr=True))
         self.docker.remove_container(self.container['Id'], force=True)