Fix cookie header key issue, add a function to compare dictionaries in robot tests

Author: Khizar Alam

src/HttpLibrary/__init__.py

@@ -516,6 +516,15 @@ def response_body_should_contain(self, should_contain):
             '"%s" should have contained "%s", but did not.' % (
                 self.response.body, should_contain)
 
+    def json_data_body_should_contain(self,should_contain):
+
+        response = load_json(self.response.body)['data']
+        should_contain_json = load_json(should_contain)
+        assert should_contain_json in response, \
+            '"%s" should have contained "%s", but did not.' % (
+                response, should_contain_json)
+
+
     def log_response_body(self, log_level='INFO'):
         """
         Logs the response body.

src/HttpLibrary/livetest.py

@@ -35,6 +35,7 @@
 
 """
 
+from __future__ import unicode_literals
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
@@ -130,7 +131,12 @@ def __init__(self, host, scheme='http', relative_to=None):
 
     def _do_httplib_request(self, req):
         "Convert WebOb Request to httplib request."
-        headers = dict((name, val) for name, val in req.headers.items())
+        headers = {}
+
+        for name, val in req.headers.items():
+            if sys.version_info[0]==2 and isinstance(name, unicode):
+                name = str(name)
+            headers[name] = val
         if req.scheme not in self.conn:
             self._load_conn(req.scheme)