Skip to content

Commit 908228c

Browse files
committed
chore: remove Region.from_region_id backup domain qbox
1 parent 0dbde38 commit 908228c

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

qiniu/http/region.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,25 @@ def from_region_id(region_id, **kwargs):
7777
services_hosts = {
7878
ServiceName.UC: ['uc.qiniuapi.com'],
7979
ServiceName.UP: [
80-
# TODO(lihs): backend seems mark qbox.me to old
81-
'up-{0}.qiniup.com'.format(region_id),
82-
'up-{0}.qbox.me'.format(region_id)
80+
'upload-{0}.qiniup.com'.format(region_id),
81+
'up-{0}.qiniup.com'.format(region_id)
8382
] if not is_z0 else [
84-
'up.qiniup.com',
85-
'up.qbox.me'
83+
'upload.qiniup.com',
84+
'up.qiniup.com'
8685
],
8786
ServiceName.IO: [
8887
'iovip-{0}.qiniuio.com'.format(region_id),
89-
'iovip-{0}.qbox.me'.format(region_id)
9088
] if not is_z0 else [
9189
'iovip.qiniuio.com',
92-
'iovip.qbox.me'
9390
],
9491
ServiceName.RS: [
9592
'rs-{0}.qiniuapi.com'.format(region_id),
96-
'rs-{0}.qbox.me'.format(region_id)
9793
],
9894
ServiceName.RSF: [
9995
'rsf-{0}.qiniuapi.com'.format(region_id),
100-
'rsf-{0}.qbox.me'.format(region_id)
10196
],
10297
ServiceName.API: [
10398
'api-{0}.qiniuapi.com'.format(region_id),
104-
'api-{0}.qbox.me'.format(region_id)
10599
],
106100
ServiceName.S3: [
107101
's3.{0}.qiniucs.com'.format(region_id),

tests/cases/test_http/test_region.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,21 @@ def test_from_region_id(self):
4848
'https://uc.qiniuapi.com'
4949
],
5050
ServiceName.UP: [
51-
'https://up.qiniup.com',
52-
'https://up.qbox.me'
51+
'https://upload.qiniup.com',
52+
'https://up.qiniup.com'
5353
],
5454
ServiceName.UP_ACC: [],
5555
ServiceName.IO: [
5656
'https://iovip.qiniuio.com',
57-
'https://iovip.qbox.me'
5857
],
5958
ServiceName.RS: [
6059
'https://rs-z0.qiniuapi.com',
61-
'https://rs-z0.qbox.me'
6260
],
6361
ServiceName.RSF: [
6462
'https://rsf-z0.qiniuapi.com',
65-
'https://rsf-z0.qbox.me'
6663
],
6764
ServiceName.API: [
6865
'https://api-z0.qiniuapi.com',
69-
'https://api-z0.qbox.me'
7066
],
7167
ServiceName.S3: [
7268
'https://s3.z0.qiniucs.com'
@@ -109,25 +105,21 @@ def test_from_region_id_with_custom_options(self):
109105
preferred_scheme + '://uc.qiniuapi.com'
110106
],
111107
ServiceName.UP: [
112-
preferred_scheme + '://up-z1.qiniup.com',
113-
preferred_scheme + '://up-z1.qbox.me'
108+
preferred_scheme + '://upload-z1.qiniup.com',
109+
preferred_scheme + '://up-z1.qiniup.com'
114110
],
115111
ServiceName.UP_ACC: [],
116112
ServiceName.IO: [
117113
preferred_scheme + '://iovip-z1.qiniuio.com',
118-
preferred_scheme + '://iovip-z1.qbox.me'
119114
],
120115
ServiceName.RS: [
121116
preferred_scheme + '://rs-z1.qiniuapi.com',
122-
preferred_scheme + '://rs-z1.qbox.me'
123117
],
124118
ServiceName.RSF: [
125119
preferred_scheme + '://rsf-z1.qiniuapi.com',
126-
preferred_scheme + '://rsf-z1.qbox.me'
127120
],
128121
ServiceName.API: [
129122
preferred_scheme + '://api-z1.qiniuapi.com',
130-
preferred_scheme + '://api-z1.qbox.me'
131123
],
132124
ServiceName.S3: [
133125
preferred_scheme + '://s3.z1.qiniucs.com'
@@ -156,7 +148,7 @@ def test_clone(self):
156148
cloned_region.region_id = 'another'
157149
cloned_region.services[ServiceName.UP][0].host = 'another-uc.qiniuapi.com'
158150
assert region.region_id == 'z0'
159-
assert region.services[ServiceName.UP][0].get_value() == 'https://up.qiniup.com'
151+
assert region.services[ServiceName.UP][0].get_value() == 'https://upload.qiniup.com'
160152
assert cloned_region.services[ServiceName.UP][0].get_value() == 'https://another-uc.qiniuapi.com'
161153

162154
def test_merge(self):

0 commit comments

Comments
 (0)