1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
diff -aur boto-2.49.0.20190327/requirements.txt boto-2.49.0.20190327.new/requirements.txt
--- boto-2.49.0.20190327/requirements.txt 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/requirements.txt 2022-11-12 17:45:21.295229358 +0100
@@ -7,4 +7,3 @@
paramiko>=1.10.0
PyYAML>=3.10
coverage==3.7.1
-mock==1.0.1
diff -aur boto-2.49.0.20190327/tests/integration/s3/test_bucket.py boto-2.49.0.20190327.new/tests/integration/s3/test_bucket.py
--- boto-2.49.0.20190327/tests/integration/s3/test_bucket.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/integration/s3/test_bucket.py 2022-11-12 17:45:37.645593701 +0100
@@ -26,7 +26,7 @@
Some unit tests for the S3 Bucket
"""
-from mock import patch, Mock
+from unittest.mock import patch, Mock
import unittest
import time
diff -aur boto-2.49.0.20190327/tests/integration/s3/test_https_cert_validation.py boto-2.49.0.20190327.new/tests/integration/s3/test_https_cert_validation.py
--- boto-2.49.0.20190327/tests/integration/s3/test_https_cert_validation.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/integration/s3/test_https_cert_validation.py 2022-11-12 17:57:21.673791221 +0100
@@ -38,7 +38,7 @@
import os
import ssl
import unittest
-import mock
+from unittest import mock
from nose.plugins.attrib import attr
diff -aur boto-2.49.0.20190327/tests/integration/s3/test_multipart.py boto-2.49.0.20190327.new/tests/integration/s3/test_multipart.py
--- boto-2.49.0.20190327/tests/integration/s3/test_multipart.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/integration/s3/test_multipart.py 2022-11-12 17:57:07.306831428 +0100
@@ -37,7 +37,7 @@
import time
from boto.compat import StringIO
-import mock
+from unittest import mock
import boto
from boto.s3.connection import S3Connection
diff -aur boto-2.49.0.20190327/tests/unit/auth/test_stsanon.py boto-2.49.0.20190327.new/tests/unit/auth/test_stsanon.py
--- boto-2.49.0.20190327/tests/unit/auth/test_stsanon.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/auth/test_stsanon.py 2022-11-12 17:45:37.652260517 +0100
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
#
import copy
-from mock import Mock
+from unittest.mock import Mock
from tests.unit import unittest
from boto.auth import STSAnonHandler
diff -aur boto-2.49.0.20190327/tests/unit/cloudformation/test_connection.py boto-2.49.0.20190327.new/tests/unit/cloudformation/test_connection.py
--- boto-2.49.0.20190327/tests/unit/cloudformation/test_connection.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/cloudformation/test_connection.py 2022-11-12 17:45:37.655593923 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import unittest
from datetime import datetime
-from mock import Mock
+from unittest.mock import Mock
from tests.unit import AWSMockServiceTestCase
from boto.cloudformation.connection import CloudFormationConnection
diff -aur boto-2.49.0.20190327/tests/unit/cloudsearch/test_document.py boto-2.49.0.20190327.new/tests/unit/cloudsearch/test_document.py
--- boto-2.49.0.20190327/tests/unit/cloudsearch/test_document.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/cloudsearch/test_document.py 2022-11-12 17:45:37.655593923 +0100
@@ -2,7 +2,7 @@
from tests.unit import unittest
from httpretty import HTTPretty
-from mock import MagicMock
+from unittest.mock import MagicMock
import json
diff -aur boto-2.49.0.20190327/tests/unit/cloudsearch2/test_document.py boto-2.49.0.20190327.new/tests/unit/cloudsearch2/test_document.py
--- boto-2.49.0.20190327/tests/unit/cloudsearch2/test_document.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/cloudsearch2/test_document.py 2022-11-12 17:45:37.655593923 +0100
@@ -4,7 +4,7 @@
from tests.unit import unittest, AWSMockServiceTestCase
from httpretty import HTTPretty
-from mock import MagicMock
+from unittest.mock import MagicMock
import json
diff -aur boto-2.49.0.20190327/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py boto-2.49.0.20190327.new/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py
--- boto-2.49.0.20190327/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py 2022-11-12 17:56:32.289449217 +0100
@@ -1,6 +1,6 @@
#!/usr/bin env python
import json
-import mock
+from unittest import mock
from tests.unit import AWSMockServiceTestCase
from boto.cloudsearch2.domain import Domain
from boto.cloudsearch2.layer1 import CloudSearchConnection
diff -aur boto-2.49.0.20190327/tests/unit/dynamodb/test_layer2.py boto-2.49.0.20190327.new/tests/unit/dynamodb/test_layer2.py
--- boto-2.49.0.20190327/tests/unit/dynamodb/test_layer2.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/dynamodb/test_layer2.py 2022-11-12 17:45:37.658927332 +0100
@@ -22,7 +22,7 @@
#
from tests.unit import unittest
-from mock import Mock
+from unittest.mock import Mock
from boto.dynamodb.layer2 import Layer2
from boto.dynamodb.table import Table, Schema
diff -aur boto-2.49.0.20190327/tests/unit/ec2/test_connection.py boto-2.49.0.20190327.new/tests/unit/ec2/test_connection.py
--- boto-2.49.0.20190327/tests/unit/ec2/test_connection.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/ec2/test_connection.py 2022-11-12 17:45:37.662260738 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from datetime import datetime, timedelta
-from mock import MagicMock, Mock
+from unittest.mock import MagicMock, Mock
from tests.unit import unittest
from tests.unit import AWSMockServiceTestCase
diff -aur boto-2.49.0.20190327/tests/unit/ec2containerservice/test_connection.py boto-2.49.0.20190327.new/tests/unit/ec2containerservice/test_connection.py
--- boto-2.49.0.20190327/tests/unit/ec2containerservice/test_connection.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/ec2containerservice/test_connection.py 2022-11-12 17:45:37.662260738 +0100
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
-from mock import Mock
+from unittest.mock import Mock
from tests.unit import unittest
import boto.ec2containerservice
diff -aur boto-2.49.0.20190327/tests/unit/glacier/test_layer2.py boto-2.49.0.20190327.new/tests/unit/glacier/test_layer2.py
--- boto-2.49.0.20190327/tests/unit/glacier/test_layer2.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/glacier/test_layer2.py 2022-11-12 17:45:37.668927553 +0100
@@ -23,7 +23,7 @@
from tests.unit import unittest
-from mock import call, Mock, patch, sentinel
+from unittest.mock import call, Mock, patch, sentinel
import codecs
from boto.glacier.layer1 import Layer1
diff -aur boto-2.49.0.20190327/tests/unit/glacier/test_writer.py boto-2.49.0.20190327.new/tests/unit/glacier/test_writer.py
--- boto-2.49.0.20190327/tests/unit/glacier/test_writer.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/glacier/test_writer.py 2022-11-12 17:45:37.668927553 +0100
@@ -24,7 +24,7 @@
from boto.compat import StringIO
from tests.unit import unittest
-from mock import (
+from unittest.mock import (
call,
Mock,
sentinel,
diff -aur boto-2.49.0.20190327/tests/unit/mws/test_connection.py boto-2.49.0.20190327.new/tests/unit/mws/test_connection.py
--- boto-2.49.0.20190327/tests/unit/mws/test_connection.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/mws/test_connection.py 2022-11-12 17:45:37.672260962 +0100
@@ -29,7 +29,7 @@
from tests.unit import AWSMockServiceTestCase
-from mock import MagicMock
+from unittest.mock import MagicMock
class TestMWSConnection(AWSMockServiceTestCase):
diff -aur boto-2.49.0.20190327/tests/unit/s3/test_bucketlistresultset.py boto-2.49.0.20190327.new/tests/unit/s3/test_bucketlistresultset.py
--- boto-2.49.0.20190327/tests/unit/s3/test_bucketlistresultset.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/s3/test_bucketlistresultset.py 2022-11-12 17:45:37.675594369 +0100
@@ -22,7 +22,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-from mock import patch, Mock
+from unittest.mock import patch, Mock
import unittest
from boto.s3.bucket import ResultSet
diff -aur boto-2.49.0.20190327/tests/unit/s3/test_bucket.py boto-2.49.0.20190327.new/tests/unit/s3/test_bucket.py
--- boto-2.49.0.20190327/tests/unit/s3/test_bucket.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/s3/test_bucket.py 2022-11-12 17:45:37.675594369 +0100
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from mock import patch
+from unittest.mock import patch
import xml.dom.minidom
from tests.unit import unittest
diff -aur boto-2.49.0.20190327/tests/unit/sns/test_connection.py boto-2.49.0.20190327.new/tests/unit/sns/test_connection.py
--- boto-2.49.0.20190327/tests/unit/sns/test_connection.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/sns/test_connection.py 2022-11-12 17:45:37.678927776 +0100
@@ -23,7 +23,7 @@
import json
from tests.unit import unittest
from tests.unit import AWSMockServiceTestCase
-from mock import Mock
+from unittest.mock import Mock
from boto.sns.connection import SNSConnection
diff -aur boto-2.49.0.20190327/tests/unit/sqs/test_queue.py boto-2.49.0.20190327.new/tests/unit/sqs/test_queue.py
--- boto-2.49.0.20190327/tests/unit/sqs/test_queue.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/sqs/test_queue.py 2022-11-12 17:45:37.678927776 +0100
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
#
from tests.unit import unittest
-from mock import Mock
+from unittest.mock import Mock
from boto.sqs.queue import Queue
diff -aur boto-2.49.0.20190327/tests/unit/swf/test_layer2_actors.py boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_actors.py
--- boto-2.49.0.20190327/tests/unit/swf/test_layer2_actors.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_actors.py 2022-11-12 17:45:37.678927776 +0100
@@ -1,7 +1,7 @@
import boto.swf.layer2
from boto.swf.layer2 import Decider, ActivityWorker
from tests.unit import unittest
-from mock import Mock
+from unittest.mock import Mock
class TestActors(unittest.TestCase):
diff -aur boto-2.49.0.20190327/tests/unit/swf/test_layer2_base.py boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_base.py
--- boto-2.49.0.20190327/tests/unit/swf/test_layer2_base.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_base.py 2022-11-12 17:45:37.678927776 +0100
@@ -1,7 +1,7 @@
import boto.swf.layer2
from boto.swf.layer2 import SWFBase
from tests.unit import unittest
-from mock import Mock
+from unittest.mock import Mock
MOCK_DOMAIN = 'Mock'
diff -aur boto-2.49.0.20190327/tests/unit/swf/test_layer2_domain.py boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_domain.py
--- boto-2.49.0.20190327/tests/unit/swf/test_layer2_domain.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_domain.py 2022-11-12 17:45:37.678927776 +0100
@@ -1,7 +1,7 @@
import boto.swf.layer2
from boto.swf.layer2 import Domain, ActivityType, WorkflowType, WorkflowExecution
from tests.unit import unittest
-from mock import Mock
+from unittest.mock import Mock
class TestDomain(unittest.TestCase):
diff -aur boto-2.49.0.20190327/tests/unit/swf/test_layer2_types.py boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_types.py
--- boto-2.49.0.20190327/tests/unit/swf/test_layer2_types.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/swf/test_layer2_types.py 2022-11-12 17:45:37.678927776 +0100
@@ -1,7 +1,7 @@
import boto.swf.layer2
from boto.swf.layer2 import ActivityType, WorkflowType, WorkflowExecution
from tests.unit import unittest
-from mock import Mock, ANY
+from unittest.mock import Mock, ANY
class TestTypes(unittest.TestCase):
diff -aur boto-2.49.0.20190327/tests/unit/test_endpoints.py boto-2.49.0.20190327.new/tests/unit/test_endpoints.py
--- boto-2.49.0.20190327/tests/unit/test_endpoints.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/test_endpoints.py 2022-11-12 17:50:47.358958026 +0100
@@ -10,7 +10,7 @@
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
-import mock
+import unittest.mock as mock
import os
import json
diff -aur boto-2.49.0.20190327/tests/unit/test_regioninfo.py boto-2.49.0.20190327.new/tests/unit/test_regioninfo.py
--- boto-2.49.0.20190327/tests/unit/test_regioninfo.py 2019-03-27 02:07:03.000000000 +0100
+++ boto-2.49.0.20190327.new/tests/unit/test_regioninfo.py 2022-11-12 17:50:51.855719636 +0100
@@ -20,7 +20,7 @@
# IN THE SOFTWARE.
#
import os
-import mock
+import unittest.mock as mock
import boto
from boto.pyami.config import Config
|