STRLCPY/snscrape

Fix proxies not being applied correctly due to missing merge with environment settings
```
Fixes #447
```
JustAnotherArchivist committed 2 years ago

6c50eee3

1 parent 5103a33a

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 1 files

■ ■ ■ ■ ■ ■

snscrape/base.py

		skipped 162 lines
163	163		return self._get_entity()
164	164
165	165		def _request(self, method, url, params = None, data = None, headers = None, timeout = 10, responseOkCallback = None, allowRedirects = True, proxies = None):
166		-	proxies = proxies or self._proxies
	166	+	proxies = proxies or self._proxies or {}
167	167		for attempt in range(self._retries + 1):
168	168		# The request is newly prepared on each retry because of potential cookie updates.
169	169		req = self._session.prepare_request(requests.Request(method, url, params = params, data = data, headers = headers))
	170	+	environmentSettings = self._session.merge_environment_settings(req.url, proxies, None, None, None)
170	171		logger.info(f'Retrieving {req.url}')
171	172		logger.debug(f'... with headers: {headers!r}')
172	173		if data:
173	174		logger.debug(f'... with data: {data!r}')
	175	+	if environmentSettings:
	176	+	logger.debug(f'... with environmentSettings: {environmentSettings!r}')
174	177		try:
175		-	r = self._session.send(req, allow_redirects = allowRedirects, timeout = timeout, proxies = proxies)
	178	+	r = self._session.send(req, allow_redirects = allowRedirects, timeout = timeout, **environmentSettings)
176	179		except requests.exceptions.RequestException as exc:
177	180		if attempt < self._retries:
178	181		retrying = ', retrying'
		skipped 66 lines