-
Notifications
You must be signed in to change notification settings - Fork 4
/
demock.patch
194 lines (163 loc) · 4.67 KB
/
demock.patch
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
---
tests/system/test_blob.py | 2 +-
tests/unit/test__helpers.py | 5 +----
tests/unit/test__http.py | 3 +--
tests/unit/test__signing.py | 2 +-
tests/unit/test_acl.py | 3 +--
tests/unit/test_batch.py | 2 +-
tests/unit/test_blob.py | 2 +-
tests/unit/test_bucket.py | 2 +-
tests/unit/test_client.py | 4 ++--
tests/unit/test_fileio.py | 2 +-
tests/unit/test_hmac_key.py | 3 +--
tests/unit/test_notification.py | 3 +--
tests/unit/test_retry.py | 3 +--
13 files changed, 14 insertions(+), 22 deletions(-)
--- a/tests/system/test_blob.py
+++ b/tests/system/test_blob.py
@@ -18,9 +18,9 @@ import io
import os
import tempfile
import warnings
+from unittest import mock
import pytest
-import mock
from google import resumable_media
from google.api_core import exceptions
--- a/tests/unit/test__helpers.py
+++ b/tests/unit/test__helpers.py
@@ -13,8 +13,7 @@
# limitations under the License.
import unittest
-
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
from google.cloud.storage.retry import DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED
@@ -556,8 +555,6 @@ class Test__base64_md5hash(unittest.Test
self.assertEqual(SIGNED_CONTENT, b"kBiQqOnIz21aGlQrIp/r/w==")
def test_it_with_stubs(self):
- import mock
-
class _Buffer(object):
def __init__(self, return_vals):
self.return_vals = return_vals
--- a/tests/unit/test__http.py
+++ b/tests/unit/test__http.py
@@ -16,8 +16,7 @@ import os.path
import sys
import unittest
from unittest.mock import patch
-
-import mock
+from unittest import mock
from google.cloud.storage import _helpers
sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..', '..')))
--- a/tests/unit/test__signing.py
+++ b/tests/unit/test__signing.py
@@ -24,8 +24,8 @@ import sys
import time
import unittest
import urllib.parse
+from unittest import mock
-import mock
import pytest
sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..')))
--- a/tests/unit/test_acl.py
+++ b/tests/unit/test_acl.py
@@ -13,8 +13,7 @@
# limitations under the License.
import unittest
-
-import mock
+from unittest import mock
from google.cloud.storage.retry import (
DEFAULT_RETRY,
--- a/tests/unit/test_batch.py
+++ b/tests/unit/test_batch.py
@@ -16,8 +16,8 @@ import http.client
from http.client import SERVICE_UNAVAILABLE
from http.client import NO_CONTENT
import unittest
+from unittest import mock
-import mock
import requests
--- a/tests/unit/test_blob.py
+++ b/tests/unit/test_blob.py
@@ -23,9 +23,9 @@ import tempfile
import unittest
import http.client
from unittest.mock import patch
+from unittest import mock
from urllib.parse import urlencode
-import mock
import pytest
from google.cloud.storage import _helpers
--- a/tests/unit/test_bucket.py
+++ b/tests/unit/test_bucket.py
@@ -14,8 +14,8 @@
import datetime
import unittest
+from unittest import mock
-import mock
import pytest
from google.cloud.storage.retry import DEFAULT_RETRY
--- a/tests/unit/test_client.py
+++ b/tests/unit/test_client.py
@@ -16,8 +16,6 @@ import base64
import http.client
import io
import json
-from unittest.mock import patch
-import mock
import os.path
import pytest
import re
@@ -25,6 +23,8 @@ import requests
import sys
import unittest
import urllib
+from unittest.mock import patch
+from unittest import mock
from google.api_core import exceptions
from google.auth.credentials import AnonymousCredentials
--- a/tests/unit/test_fileio.py
+++ b/tests/unit/test_fileio.py
@@ -17,8 +17,8 @@
import unittest
import io
import string
+from unittest import mock
-import mock
from google.api_core.exceptions import RequestRangeNotSatisfiable
from google.cloud.storage.retry import DEFAULT_RETRY
--- a/tests/unit/test_hmac_key.py
+++ b/tests/unit/test_hmac_key.py
@@ -13,8 +13,7 @@
# limitations under the License.
import unittest
-
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
from google.cloud.storage.retry import DEFAULT_RETRY_IF_ETAG_IN_JSON
--- a/tests/unit/test_notification.py
+++ b/tests/unit/test_notification.py
@@ -13,8 +13,7 @@
# limitations under the License.
import unittest
-
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
--- a/tests/unit/test_retry.py
+++ b/tests/unit/test_retry.py
@@ -13,11 +13,10 @@
# limitations under the License.
import unittest
+from unittest import mock
from google.cloud.storage import _helpers
-import mock
-
class Test_should_retry(unittest.TestCase):
def _call_fut(self, exc):