Merge branch 'release/v1.6.1'

deanishe · Jul 21, 2014 · 6dfb3e0 · 6dfb3e0
2 parents 3823292 + 6b53c33
commit 6dfb3e0
Show file tree

Hide file tree

Showing 4 changed files with 26 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
@@ -212,6 +212,26 @@ def test_iter_content_decoded(self):
             contents += u
         self.assertEqual(contents, self.fubar_unicode)
 
+    def test_encoded_content(self):
+        """Encoded content"""
+        r = web.get(self.fubar_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content, self.fubar_bytes)
+        self.assertEqual(r.text, self.fubar_unicode)
+
+    def test_decoded_content(self):
+        """Decoded content"""
+        r = web.get(self.fubar_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.text, self.fubar_unicode)
+
+    def test_encoded_decode_content(self):
+        """Encoded and decoded content"""
+        r = web.get(self.fubar_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content, self.fubar_bytes)
+        self.assertEqual(r.text, self.fubar_unicode)
+
 
 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.6'
+__version__ = '1.6.1'
 
 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
@@ -155,6 +155,7 @@ def __init__(self, request):
         self.status_code = None
         self.reason = None
         self.headers = {}
+        self._content = None
 
         # Execute query
         try:
@@ -200,7 +201,10 @@ def content(self):
 
         """
 
-        return self.raw.read()
+        if not self._content:
+            self._content = self.raw.read()
+
+        return self._content
 
     @property
     def text(self):