1 --- boto-2.49.0/tests/integration/s3/test_bucket.py.orig 2018-07-11 19:35:36.000000000 +0200
2 +++ boto-2.49.0/tests/integration/s3/test_bucket.py 2021-02-14 20:03:03.481843289 +0100
4 Some unit tests for the S3 Bucket
7 -from mock import patch, Mock
9 + from mock import patch, Mock
11 + from unittest.mock import patch, Mock
15 --- boto-2.49.0/tests/integration/s3/test_https_cert_validation.py.orig 2018-07-11 19:35:36.000000000 +0200
16 +++ boto-2.49.0/tests/integration/s3/test_https_cert_validation.py 2021-02-14 20:03:18.711760781 +0100
17 @@ -38,7 +38,7 @@ Note that this test assumes two external
22 +from tests.compat import mock
24 from nose.plugins.attrib import attr
26 --- boto-2.49.0/tests/integration/s3/test_multipart.py.orig 2018-07-11 19:35:36.000000000 +0200
27 +++ boto-2.49.0/tests/integration/s3/test_multipart.py 2021-02-14 20:03:12.025130339 +0100
28 @@ -37,7 +37,7 @@ import unittest
30 from boto.compat import StringIO
33 +from tests.compat import mock
36 from boto.s3.connection import S3Connection
37 --- boto-2.49.0/tests/unit/auth/test_stsanon.py.orig 2018-07-11 19:35:36.000000000 +0200
38 +++ boto-2.49.0/tests/unit/auth/test_stsanon.py 2021-02-14 19:57:30.110315984 +0100
43 -from mock import Mock
45 + from mock import Mock
47 + from unittest.mock import Mock
48 from tests.unit import unittest
50 from boto.auth import STSAnonHandler
51 --- boto-2.49.0/tests/unit/cloudformation/test_connection.py.orig 2018-07-11 19:35:36.000000000 +0200
52 +++ boto-2.49.0/tests/unit/cloudformation/test_connection.py 2021-02-14 20:01:15.389095544 +0100
56 from datetime import datetime
57 -from mock import Mock
59 + from mock import Mock
61 + from unittest.mock import Mock
63 from tests.unit import AWSMockServiceTestCase
64 from boto.cloudformation.connection import CloudFormationConnection
65 --- boto-2.49.0/tests/unit/cloudsearch2/test_document.py.orig 2018-07-11 19:35:36.000000000 +0200
66 +++ boto-2.49.0/tests/unit/cloudsearch2/test_document.py 2021-02-14 20:00:05.506140799 +0100
67 @@ -4,7 +4,10 @@ from boto.cloudsearch2.layer1 import Clo
69 from tests.unit import unittest, AWSMockServiceTestCase
70 from httpretty import HTTPretty
71 -from mock import MagicMock
73 + from mock import MagicMock
75 + from unittest.mock import MagicMock
79 --- boto-2.49.0/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py.orig 2018-07-11 19:35:36.000000000 +0200
80 +++ boto-2.49.0/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py 2021-02-14 19:59:29.589668709 +0100
85 +from tests.compat import mock
86 from tests.unit import AWSMockServiceTestCase
87 from boto.cloudsearch2.domain import Domain
88 from boto.cloudsearch2.layer1 import CloudSearchConnection
89 --- boto-2.49.0/tests/unit/cloudsearch/test_document.py.orig 2018-07-11 19:35:36.000000000 +0200
90 +++ boto-2.49.0/tests/unit/cloudsearch/test_document.py 2021-02-14 20:00:44.145931469 +0100
93 from tests.unit import unittest
94 from httpretty import HTTPretty
95 -from mock import MagicMock
97 + from mock import MagicMock
99 + from unittest.mock import MagicMock
103 --- boto-2.49.0/tests/unit/dynamodb/test_layer2.py.orig 2018-07-11 19:35:36.000000000 +0200
104 +++ boto-2.49.0/tests/unit/dynamodb/test_layer2.py 2021-02-14 20:00:25.679364845 +0100
108 from tests.unit import unittest
109 -from mock import Mock
111 + from mock import Mock
113 + from unittest.mock import Mock
115 from boto.dynamodb.layer2 import Layer2
116 from boto.dynamodb.table import Table, Schema
117 --- boto-2.49.0/tests/unit/ec2containerservice/test_connection.py.orig 2018-07-11 19:35:36.000000000 +0200
118 +++ boto-2.49.0/tests/unit/ec2containerservice/test_connection.py 2021-02-14 19:55:05.694431685 +0100
120 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
123 -from mock import Mock
125 + from mock import Mock
127 + from unittest.mock import Mock
128 from tests.unit import unittest
130 import boto.ec2containerservice
131 --- boto-2.49.0/tests/unit/ec2/test_connection.py.orig 2018-07-11 19:35:36.000000000 +0200
132 +++ boto-2.49.0/tests/unit/ec2/test_connection.py 2021-02-14 20:02:23.685392218 +0100
134 #!/usr/bin/env python
135 from datetime import datetime, timedelta
136 -from mock import MagicMock, Mock
138 + from mock import MagicMock, Mock
140 + from unittest.mock import MagicMock, Mock
141 from tests.unit import unittest
142 from tests.unit import AWSMockServiceTestCase
144 --- boto-2.49.0/tests/unit/glacier/test_layer2.py.orig 2018-07-11 19:35:36.000000000 +0200
145 +++ boto-2.49.0/tests/unit/glacier/test_layer2.py 2021-02-14 19:58:41.029931779 +0100
148 from tests.unit import unittest
150 -from mock import call, Mock, patch, sentinel
152 + from mock import call, Mock, patch, sentinel
154 + from unittest.mock import call, Mock, patch, sentinel
157 from boto.glacier.layer1 import Layer1
158 --- boto-2.49.0/tests/unit/glacier/test_writer.py.orig 2018-07-11 22:41:30.000000000 +0200
159 +++ boto-2.49.0/tests/unit/glacier/test_writer.py 2021-02-14 19:59:16.493072992 +0100
160 @@ -24,11 +24,19 @@ import itertools
161 from boto.compat import StringIO
163 from tests.unit import unittest
176 + from unittest.mock import (
182 from nose.tools import assert_equal
184 from boto.glacier.layer1 import Layer1
185 --- boto-2.49.0/tests/unit/mws/test_connection.py.orig 2018-07-11 19:35:36.000000000 +0200
186 +++ boto-2.49.0/tests/unit/mws/test_connection.py 2021-02-14 19:57:56.120175076 +0100
187 @@ -29,7 +29,10 @@ from tests.compat import unittest
189 from tests.unit import AWSMockServiceTestCase
191 -from mock import MagicMock
193 + from mock import MagicMock
195 + from unittest.mock import MagicMock
198 class TestMWSConnection(AWSMockServiceTestCase):
199 --- boto-2.49.0/tests/unit/s3/test_bucketlistresultset.py.orig 2018-07-11 19:35:36.000000000 +0200
200 +++ boto-2.49.0/tests/unit/s3/test_bucketlistresultset.py 2021-02-14 19:56:36.633939023 +0100
202 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
205 -from mock import patch, Mock
207 + from mock import patch, Mock
209 + from unittest.mock import patch, Mock
212 from boto.s3.bucket import ResultSet
213 --- boto-2.49.0/tests/unit/s3/test_bucket.py.orig 2018-07-11 19:35:36.000000000 +0200
214 +++ boto-2.49.0/tests/unit/s3/test_bucket.py 2021-02-14 19:56:54.867173579 +0100
216 # -*- coding: utf-8 -*-
217 -from mock import patch
219 + from mock import patch
221 + from unittest.mock import patch
222 import xml.dom.minidom
224 from tests.unit import unittest
225 --- boto-2.49.0/tests/unit/sns/test_connection.py.orig 2018-07-11 19:35:36.000000000 +0200
226 +++ boto-2.49.0/tests/unit/sns/test_connection.py 2021-02-14 19:57:21.567028933 +0100
229 from tests.unit import unittest
230 from tests.unit import AWSMockServiceTestCase
231 -from mock import Mock
233 + from mock import Mock
235 + from unittest.mock import Mock
237 from boto.sns.connection import SNSConnection
239 --- boto-2.49.0/tests/unit/sqs/test_queue.py.orig 2018-07-11 19:35:36.000000000 +0200
240 +++ boto-2.49.0/tests/unit/sqs/test_queue.py 2021-02-14 20:00:55.939200913 +0100
244 from tests.unit import unittest
245 -from mock import Mock
247 + from mock import Mock
249 + from unittest.mock import Mock
251 from boto.sqs.queue import Queue
253 --- boto-2.49.0/tests/unit/swf/test_layer2_actors.py.orig 2018-07-11 19:35:36.000000000 +0200
254 +++ boto-2.49.0/tests/unit/swf/test_layer2_actors.py 2021-02-14 20:01:29.175687522 +0100
256 import boto.swf.layer2
257 from boto.swf.layer2 import Decider, ActivityWorker
258 from tests.unit import unittest
259 -from mock import Mock
261 + from mock import Mock
263 + from unittest.mock import Mock
266 class TestActors(unittest.TestCase):
267 --- boto-2.49.0/tests/unit/swf/test_layer2_base.py.orig 2018-07-11 19:35:36.000000000 +0200
268 +++ boto-2.49.0/tests/unit/swf/test_layer2_base.py 2021-02-14 20:01:23.549051338 +0100
270 import boto.swf.layer2
271 from boto.swf.layer2 import SWFBase
272 from tests.unit import unittest
273 -from mock import Mock
275 + from mock import Mock
277 + from unittest.mock import Mock
281 --- boto-2.49.0/tests/unit/swf/test_layer2_domain.py.orig 2018-07-11 19:35:36.000000000 +0200
282 +++ boto-2.49.0/tests/unit/swf/test_layer2_domain.py 2021-02-14 20:01:54.462217200 +0100
284 import boto.swf.layer2
285 from boto.swf.layer2 import Domain, ActivityType, WorkflowType, WorkflowExecution
286 from tests.unit import unittest
287 -from mock import Mock
289 + from mock import Mock
291 + from unittest.mock import Mock
294 class TestDomain(unittest.TestCase):
295 --- boto-2.49.0/tests/unit/swf/test_layer2_types.py.orig 2018-07-11 19:35:36.000000000 +0200
296 +++ boto-2.49.0/tests/unit/swf/test_layer2_types.py 2021-02-14 20:01:44.152273054 +0100
298 import boto.swf.layer2
299 from boto.swf.layer2 import ActivityType, WorkflowType, WorkflowExecution
300 from tests.unit import unittest
301 -from mock import Mock, ANY
303 + from mock import Mock, ANY
305 + from unittest.mock import Mock, ANY
308 class TestTypes(unittest.TestCase):
309 --- boto-2.49.0/tests/unit/test_endpoints.py.orig 2018-07-11 19:35:36.000000000 +0200
310 +++ boto-2.49.0/tests/unit/test_endpoints.py 2021-02-14 19:58:14.186743868 +0100
312 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
313 # ANY KIND, either express or implied. See the License for the specific
314 # language governing permissions and limitations under the License.
316 +from tests.compat import mock
320 --- boto-2.49.0/tests/unit/test_regioninfo.py.orig 2018-07-11 19:35:36.000000000 +0200
321 +++ boto-2.49.0/tests/unit/test_regioninfo.py 2021-02-14 19:59:40.419610038 +0100
327 +from tests.compat import mock
330 from boto.pyami.config import Config