Merge lp:~h-pawan/gtg/rtm_json_parsing_exception into lp:~gtg/gtg/old-trunk

[Pawan Hegde]

Encoding errors in communication with RTM fixed.

[lp:~h-pawan/gtg/rtm_json_parsing_exception]

1359. By Pawan Hegde on 2014-03-03

Corrected json loading exception

=== modified file 'CHANGELOG'
--- CHANGELOG	2014-03-03 16:57:03 +0000
+++ CHANGELOG	2014-03-03 17:10:29 +0000
@@ -15,7 +15,8 @@
     * Fix for bug #1282955: Clicking out side the calender widget should close the widget by Sagar Ghuge
     * Fix for bug #1033268: Mouseover String Incorrect, by Sushant Raikar
     * Fix for bug #644993 : Automatic generation of tag color, by Atit Anand
-    * Fix for bug #1286491 : RTM sync backend fails to load, by Pawan Hegde
+    * Fix for bug #1286491: RTM sync backend fails to load, by Pawan Hegde
+    * Fix for bug #1286493: GTG cannot connect to RTM. Fails with "TypeError: Unicode-objects must be encoded before hashing" while trying to get frob, by Pawan Hegde
 
 2013-11-24 Getting Things GNOME! 0.3.1
     * Fix for bug #1024473: Have 'Show Main Window' in notification area, by Antonio Roquentin

=== modified file 'GTG/backends/rtm/rtm.py'
--- GTG/backends/rtm/rtm.py	2013-08-28 20:11:53 +0000
+++ GTG/backends/rtm/rtm.py	2014-03-03 17:10:29 +0000
@@ -90,7 +90,7 @@
     def _sign(self, params):
         "Sign the parameters with MD5 hash"
         pairs = ''.join(['%s%s' % (k, v) for k, v in sortedItems(params)])
-        return md5(self.secret + pairs).hexdigest()
+        return md5((self.secret + pairs).encode('utf-8')).hexdigest()
 
     def get(self, **params):
         "Get the XML response for the passed `params`."
@@ -102,9 +102,9 @@
 
         # LOG.debug("JSON response: \n%s" % json)
         if _use_jsonlib:
-            data = dottedDict('ROOT', json.loads(json_data))
+            data = dottedDict('ROOT', json.loads(json_data.decode('utf-8')))
         else:
-            data = dottedJSON(json_data)
+            data = dottedJSON(json_data.decode('utf-8'))
         rsp = data.rsp
 
         if rsp.stat == 'fail':