Skip to content

Commit 3f67795

Browse files
yoshi-automationtseaver
yoshi-automation
and
tseaver
authored
chore: fix exception sorting (via synth) (#204)
Sorting issue, googleapis/gapic-generator-python#617, fixed by googleapis/gapic-generator-python#619 Co-authored-by: Tres Seaver <[email protected]>
1 parent 68dd6cd commit 3f67795

File tree

5 files changed

+139
-32
lines changed

5 files changed

+139
-32
lines changed

‎packages/google-cloud-firestore/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ async def list_indexes(
274274
multiplier=1.3,
275275
predicate=retries.if_exception_type(
276276
exceptions.DeadlineExceeded,
277-
exceptions.ServiceUnavailable,
278277
exceptions.InternalServerError,
278+
exceptions.ServiceUnavailable,
279279
),
280280
),
281281
default_timeout=60.0,
@@ -362,8 +362,8 @@ async def get_index(
362362
multiplier=1.3,
363363
predicate=retries.if_exception_type(
364364
exceptions.DeadlineExceeded,
365-
exceptions.ServiceUnavailable,
366365
exceptions.InternalServerError,
366+
exceptions.ServiceUnavailable,
367367
),
368368
),
369369
default_timeout=60.0,
@@ -437,8 +437,8 @@ async def delete_index(
437437
multiplier=1.3,
438438
predicate=retries.if_exception_type(
439439
exceptions.DeadlineExceeded,
440-
exceptions.ServiceUnavailable,
441440
exceptions.InternalServerError,
441+
exceptions.ServiceUnavailable,
442442
),
443443
),
444444
default_timeout=60.0,
@@ -520,8 +520,8 @@ async def get_field(
520520
multiplier=1.3,
521521
predicate=retries.if_exception_type(
522522
exceptions.DeadlineExceeded,
523-
exceptions.ServiceUnavailable,
524523
exceptions.InternalServerError,
524+
exceptions.ServiceUnavailable,
525525
),
526526
),
527527
default_timeout=60.0,
@@ -713,8 +713,8 @@ async def list_fields(
713713
multiplier=1.3,
714714
predicate=retries.if_exception_type(
715715
exceptions.DeadlineExceeded,
716-
exceptions.ServiceUnavailable,
717716
exceptions.InternalServerError,
717+
exceptions.ServiceUnavailable,
718718
),
719719
),
720720
default_timeout=60.0,

‎packages/google-cloud-firestore/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ def _prep_wrapped_messages(self, client_info):
125125
multiplier=1.3,
126126
predicate=retries.if_exception_type(
127127
exceptions.DeadlineExceeded,
128-
exceptions.ServiceUnavailable,
129128
exceptions.InternalServerError,
129+
exceptions.ServiceUnavailable,
130130
),
131131
),
132132
default_timeout=60.0,
@@ -140,8 +140,8 @@ def _prep_wrapped_messages(self, client_info):
140140
multiplier=1.3,
141141
predicate=retries.if_exception_type(
142142
exceptions.DeadlineExceeded,
143-
exceptions.ServiceUnavailable,
144143
exceptions.InternalServerError,
144+
exceptions.ServiceUnavailable,
145145
),
146146
),
147147
default_timeout=60.0,
@@ -155,8 +155,8 @@ def _prep_wrapped_messages(self, client_info):
155155
multiplier=1.3,
156156
predicate=retries.if_exception_type(
157157
exceptions.DeadlineExceeded,
158-
exceptions.ServiceUnavailable,
159158
exceptions.InternalServerError,
159+
exceptions.ServiceUnavailable,
160160
),
161161
),
162162
default_timeout=60.0,
@@ -170,8 +170,8 @@ def _prep_wrapped_messages(self, client_info):
170170
multiplier=1.3,
171171
predicate=retries.if_exception_type(
172172
exceptions.DeadlineExceeded,
173-
exceptions.ServiceUnavailable,
174173
exceptions.InternalServerError,
174+
exceptions.ServiceUnavailable,
175175
),
176176
),
177177
default_timeout=60.0,
@@ -188,8 +188,8 @@ def _prep_wrapped_messages(self, client_info):
188188
multiplier=1.3,
189189
predicate=retries.if_exception_type(
190190
exceptions.DeadlineExceeded,
191-
exceptions.ServiceUnavailable,
192191
exceptions.InternalServerError,
192+
exceptions.ServiceUnavailable,
193193
),
194194
),
195195
default_timeout=60.0,

‎packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/async_client.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ async def get_document(
155155
multiplier=1.3,
156156
predicate=retries.if_exception_type(
157157
exceptions.DeadlineExceeded,
158-
exceptions.ServiceUnavailable,
159158
exceptions.InternalServerError,
159+
exceptions.ServiceUnavailable,
160160
),
161161
),
162162
default_timeout=60.0,
@@ -219,8 +219,8 @@ async def list_documents(
219219
multiplier=1.3,
220220
predicate=retries.if_exception_type(
221221
exceptions.DeadlineExceeded,
222-
exceptions.ServiceUnavailable,
223222
exceptions.InternalServerError,
223+
exceptions.ServiceUnavailable,
224224
),
225225
),
226226
default_timeout=60.0,
@@ -397,8 +397,8 @@ async def delete_document(
397397
multiplier=1.3,
398398
predicate=retries.if_exception_type(
399399
exceptions.DeadlineExceeded,
400-
exceptions.ServiceUnavailable,
401400
exceptions.InternalServerError,
401+
exceptions.ServiceUnavailable,
402402
),
403403
),
404404
default_timeout=60.0,
@@ -459,8 +459,8 @@ def batch_get_documents(
459459
multiplier=1.3,
460460
predicate=retries.if_exception_type(
461461
exceptions.DeadlineExceeded,
462-
exceptions.ServiceUnavailable,
463462
exceptions.InternalServerError,
463+
exceptions.ServiceUnavailable,
464464
),
465465
),
466466
default_timeout=300.0,
@@ -540,8 +540,8 @@ async def begin_transaction(
540540
multiplier=1.3,
541541
predicate=retries.if_exception_type(
542542
exceptions.DeadlineExceeded,
543-
exceptions.ServiceUnavailable,
544543
exceptions.InternalServerError,
544+
exceptions.ServiceUnavailable,
545545
),
546546
),
547547
default_timeout=60.0,
@@ -711,8 +711,8 @@ async def rollback(
711711
multiplier=1.3,
712712
predicate=retries.if_exception_type(
713713
exceptions.DeadlineExceeded,
714-
exceptions.ServiceUnavailable,
715714
exceptions.InternalServerError,
715+
exceptions.ServiceUnavailable,
716716
),
717717
),
718718
default_timeout=60.0,
@@ -771,8 +771,8 @@ def run_query(
771771
multiplier=1.3,
772772
predicate=retries.if_exception_type(
773773
exceptions.DeadlineExceeded,
774-
exceptions.ServiceUnavailable,
775774
exceptions.InternalServerError,
775+
exceptions.ServiceUnavailable,
776776
),
777777
),
778778
default_timeout=300.0,
@@ -948,8 +948,8 @@ def listen(
948948
multiplier=1.3,
949949
predicate=retries.if_exception_type(
950950
exceptions.DeadlineExceeded,
951-
exceptions.ServiceUnavailable,
952951
exceptions.InternalServerError,
952+
exceptions.ServiceUnavailable,
953953
),
954954
),
955955
default_timeout=86400.0,
@@ -1032,8 +1032,8 @@ async def list_collection_ids(
10321032
multiplier=1.3,
10331033
predicate=retries.if_exception_type(
10341034
exceptions.DeadlineExceeded,
1035-
exceptions.ServiceUnavailable,
10361035
exceptions.InternalServerError,
1036+
exceptions.ServiceUnavailable,
10371037
),
10381038
),
10391039
default_timeout=60.0,
@@ -1108,7 +1108,7 @@ async def batch_write(
11081108
maximum=60.0,
11091109
multiplier=1.3,
11101110
predicate=retries.if_exception_type(
1111-
exceptions.ServiceUnavailable, exceptions.Aborted,
1111+
exceptions.Aborted, exceptions.ServiceUnavailable,
11121112
),
11131113
),
11141114
default_timeout=60.0,

‎packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/base.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def _prep_wrapped_messages(self, client_info):
118118
multiplier=1.3,
119119
predicate=retries.if_exception_type(
120120
exceptions.DeadlineExceeded,
121-
exceptions.ServiceUnavailable,
122121
exceptions.InternalServerError,
122+
exceptions.ServiceUnavailable,
123123
),
124124
),
125125
default_timeout=60.0,
@@ -133,8 +133,8 @@ def _prep_wrapped_messages(self, client_info):
133133
multiplier=1.3,
134134
predicate=retries.if_exception_type(
135135
exceptions.DeadlineExceeded,
136-
exceptions.ServiceUnavailable,
137136
exceptions.InternalServerError,
137+
exceptions.ServiceUnavailable,
138138
),
139139
),
140140
default_timeout=60.0,
@@ -159,8 +159,8 @@ def _prep_wrapped_messages(self, client_info):
159159
multiplier=1.3,
160160
predicate=retries.if_exception_type(
161161
exceptions.DeadlineExceeded,
162-
exceptions.ServiceUnavailable,
163162
exceptions.InternalServerError,
163+
exceptions.ServiceUnavailable,
164164
),
165165
),
166166
default_timeout=60.0,
@@ -174,8 +174,8 @@ def _prep_wrapped_messages(self, client_info):
174174
multiplier=1.3,
175175
predicate=retries.if_exception_type(
176176
exceptions.DeadlineExceeded,
177-
exceptions.ServiceUnavailable,
178177
exceptions.InternalServerError,
178+
exceptions.ServiceUnavailable,
179179
),
180180
),
181181
default_timeout=300.0,
@@ -189,8 +189,8 @@ def _prep_wrapped_messages(self, client_info):
189189
multiplier=1.3,
190190
predicate=retries.if_exception_type(
191191
exceptions.DeadlineExceeded,
192-
exceptions.ServiceUnavailable,
193192
exceptions.InternalServerError,
193+
exceptions.ServiceUnavailable,
194194
),
195195
),
196196
default_timeout=60.0,
@@ -215,8 +215,8 @@ def _prep_wrapped_messages(self, client_info):
215215
multiplier=1.3,
216216
predicate=retries.if_exception_type(
217217
exceptions.DeadlineExceeded,
218-
exceptions.ServiceUnavailable,
219218
exceptions.InternalServerError,
219+
exceptions.ServiceUnavailable,
220220
),
221221
),
222222
default_timeout=60.0,
@@ -230,8 +230,8 @@ def _prep_wrapped_messages(self, client_info):
230230
multiplier=1.3,
231231
predicate=retries.if_exception_type(
232232
exceptions.DeadlineExceeded,
233-
exceptions.ServiceUnavailable,
234233
exceptions.InternalServerError,
234+
exceptions.ServiceUnavailable,
235235
),
236236
),
237237
default_timeout=300.0,
@@ -251,8 +251,8 @@ def _prep_wrapped_messages(self, client_info):
251251
multiplier=1.3,
252252
predicate=retries.if_exception_type(
253253
exceptions.DeadlineExceeded,
254-
exceptions.ServiceUnavailable,
255254
exceptions.InternalServerError,
255+
exceptions.ServiceUnavailable,
256256
),
257257
),
258258
default_timeout=86400.0,
@@ -266,8 +266,8 @@ def _prep_wrapped_messages(self, client_info):
266266
multiplier=1.3,
267267
predicate=retries.if_exception_type(
268268
exceptions.DeadlineExceeded,
269-
exceptions.ServiceUnavailable,
270269
exceptions.InternalServerError,
270+
exceptions.ServiceUnavailable,
271271
),
272272
),
273273
default_timeout=60.0,
@@ -280,7 +280,7 @@ def _prep_wrapped_messages(self, client_info):
280280
maximum=60.0,
281281
multiplier=1.3,
282282
predicate=retries.if_exception_type(
283-
exceptions.ServiceUnavailable, exceptions.Aborted,
283+
exceptions.Aborted, exceptions.ServiceUnavailable,
284284
),
285285
),
286286
default_timeout=60.0,

0 commit comments

Comments
 (0)