Skip to content

Commit 152355b

Browse files
committed
api/v2/clients.py fix
1 parent ce2f1d8 commit 152355b

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

readthedocs/api/v2/client.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
log = logging.getLogger(__name__)
1414

15-
PRODUCTION_DOMAIN = settings.PRODUCTION_DOMAIN
16-
API_HOST = settings.SLUMBER_API_HOST
17-
USER = settings.SLUMBER_USERNAME
18-
PASS = settings.SLUMBER_PASSWORD
19-
2015

2116
class DrfJsonSerializer(serialize.JsonSerializer):
2217

@@ -31,7 +26,7 @@ def dumps(self, data):
3126

3227
def setup_api():
3328
session = requests.Session()
34-
if API_HOST.startswith('https'):
29+
if settings.SLUMBER_API_HOST.startswith('https'):
3530
# Only use the HostHeaderSSLAdapter for HTTPS connections
3631
adapter_class = host_header_ssl.HostHeaderSSLAdapter
3732
else:
@@ -50,12 +45,12 @@ def setup_api():
5045
)
5146

5247
session.mount(
53-
API_HOST,
48+
settings.SLUMBER_API_HOST,
5449
adapter_class(max_retries=retry),
5550
)
56-
session.headers.update({'Host': PRODUCTION_DOMAIN})
51+
session.headers.update({'Host': settings.PRODUCTION_DOMAIN})
5752
api_config = {
58-
'base_url': '%s/api/v2/' % API_HOST,
53+
'base_url': '%s/api/v2/' % settings.SLUMBER_API_HOST,
5954
'serializer': serialize.Serializer(
6055
default='json-drf',
6156
serializers=[
@@ -65,13 +60,13 @@ def setup_api():
6560
),
6661
'session': session,
6762
}
68-
if USER and PASS:
63+
if settings.SLUMBER_USERNAME and settings.SLUMBER_PASSWORD:
6964
log.debug(
7065
'Using slumber v2 with user %s, pointed at %s',
71-
USER,
72-
API_HOST,
66+
settings.SLUMBER_USERNAME,
67+
settings.SLUMBER_API_HOST,
7368
)
74-
session.auth = (USER, PASS)
69+
session.auth = (settings.SLUMBER_USERNAME, settings.SLUMBER_PASSWORD)
7570
else:
7671
log.warning('SLUMBER_USERNAME/PASSWORD settings are not set')
7772
return API(**api_config)

0 commit comments

Comments
 (0)