Fix encoding issue with web.py JSON decoding

deanishe · May 11, 2014 · 49acf86 · 49acf86
1 parent 3e76a9f
commit 49acf86
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/alfred-workflow.zip b/alfred-workflow.zip
diff --git a/tests/test_web.py b/tests/test_web.py
@@ -183,6 +183,14 @@ def test_file_upload_without_form_data(self):
         bindata = b64decode(bindata[len(preamble):])
         self.assertEqual(bindata, open(self.test_file, 'rb').read())
 
+    def test_json_encoding(self):
+        """JSON decoded correctly"""
+        url = 'https://suggestqueries.google.com/complete/search?client=firefox&q=münchen'
+        r = web.get(url)
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertEqual(data[0], 'münchen')
+
 
 if __name__ == '__main__':  # pragma: no cover
     unittest.main()
diff --git a/workflow/__init__.py b/workflow/__init__.py
@@ -108,7 +108,7 @@ def main(wf):
 
 """
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 from .workflow import Workflow, PasswordNotFound, KeychainError
 from .workflow import (ICON_ERROR, ICON_WARNING, ICON_NOTE, ICON_INFO,

diff --git a/workflow/web.py b/workflow/web.py
@@ -181,7 +181,7 @@ def json(self):
 
         """
 
-        return json.loads(self.content)
+        return json.loads(self.content, self.encoding or 'utf-8')
 
     @property
     def text(self):