From 5281633ba5d333dcf9536e9c4194004fb0a607c5 Mon Sep 17 00:00:00 2001
From: Franklyn Tackitt <franklyn@tackitt.net>
Date: Fri, 21 Aug 2015 10:44:11 -0700
Subject: [PATCH] Fix requirement in docs/requirements.txt, fix test

---
 docs/requirements.txt      |  2 +-
 tests/test_flask_static.py | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7d01ae6..216a6f4 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.9
 Jinja2==2.6
 Werkzeug==0.8.3
-boto==2.29.1
+boto3==1.1.1
 wsgiref==0.1.2
diff --git a/tests/test_flask_static.py b/tests/test_flask_static.py
index 2b1f072..fde9ae1 100644
--- a/tests/test_flask_static.py
+++ b/tests/test_flask_static.py
@@ -3,8 +3,6 @@ import ntpath
 import tempfile
 import os
 
-import pprint
-
 from mock import Mock, patch, call, mock_open
 from flask import Flask, render_template_string, Blueprint
 
@@ -237,7 +235,7 @@ class S3Tests(unittest.TestCase):
             self.assertEquals(exp, actual)
 
     @patch('flask_s3.boto3')
-    @patch('flask_s3.open', mock_open(read_data='test'))
+    @patch('__builtin__.open', mock_open(read_data='test'))
     def test__write_files(self, key_mock):
         """ Tests _write_files """
         static_url_loc = '/foo/static'
@@ -278,12 +276,12 @@ class S3Tests(unittest.TestCase):
                 f.write(data)
 
             # We expect each file to be uploaded
-            expected.extend([call.put_object(ACL='public-read',
-                                             Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
-                                                       'Content-Encoding': 'gzip'},
-                                             Bucket=None,
-                                             Key=filename,
-                                             Body=data)])
+            expected.append(call.put_object(ACL='public-read',
+                                            Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
+                                                      'Content-Encoding': 'gzip'},
+                                            Bucket=None,
+                                            Key=filename.lstrip("/"),
+                                            Body=data))
 
         files = {(static_url_loc, static_folder): filenames}
 
@@ -299,16 +297,18 @@ class S3Tests(unittest.TestCase):
             f.write(data)
 
         # We expect only this file to be uploaded
-        expected.extend([call.put_object(ACL='public-read',
-                                         Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
-                                                   'Content-Encoding': 'gzip'},
-                                         Bucket=None,
-                                         Key=filenames[1],
-                                         Body=data)])
+        expected.append(call.put_object(ACL='public-read',
+                                        Metadata={'Expires': 'Thu, 31 Dec 2037 23:59:59 GMT',
+                                                  'Content-Encoding': 'gzip'},
+                                        Bucket=None,
+                                        Key=filenames[1].lstrip("/"),
+                                        Body=data))
 
         new_hashes = flask_s3._upload_files(key_mock, self.app, files, None,
                                             hashes=dict(hashes))
+        import pprint
 
+        pprint.pprint(zip(expected, key_mock.mock_calls))
         self.assertEqual(expected, key_mock.mock_calls)
 
     def test_static_folder_path(self):