Skip to content

Commit a847279

Browse files
authored
Merge branch 'master' into docs/crawl4ai-guide
2 parents 7126de9 + 5bd6eb9 commit a847279

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
99

1010
- [**breaking**] Remove deprecated APIs ([#918](https://github.com/apify/apify-sdk-python/pull/918)) ([3e5728d](https://github.com/apify/apify-sdk-python/commit/3e5728d94cb8fd879d5a76e33a03d55792d835d5)) by [@vdusek](https://github.com/vdusek), closes [#635](https://github.com/apify/apify-sdk-python/issues/635)
1111
- [**breaking**] Mark secondary arguments as keyword-only ([#917](https://github.com/apify/apify-sdk-python/pull/917)) ([eb94c99](https://github.com/apify/apify-sdk-python/commit/eb94c992ec4aba1cd7cf4dfd7a98731cb304651b)) by [@vdusek](https://github.com/vdusek), closes [#881](https://github.com/apify/apify-sdk-python/issues/881)
12+
- [**breaking**] Adapt to apify-client v3 ([#719](https://github.com/apify/apify-sdk-python/pull/719)) ([10203bc](https://github.com/apify/apify-sdk-python/commit/10203bc51e67590c97938b37d81614376bc3d29a)) by [@vdusek](https://github.com/vdusek), closes [#697](https://github.com/apify/apify-sdk-python/issues/697), [#736](https://github.com/apify/apify-sdk-python/issues/736), [#770](https://github.com/apify/apify-sdk-python/issues/770), [#853](https://github.com/apify/apify-sdk-python/issues/853)
1213

1314
### ⚙️ Miscellaneous Tasks
1415

src/apify/scrapy/middlewares/apify_proxy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from scrapy.exceptions import NotConfigured
88

99
from apify import Actor, ProxyConfiguration
10-
from apify.scrapy import get_basic_auth_header
10+
from apify.scrapy.utils import get_basic_auth_header
1111

1212
if TYPE_CHECKING:
1313
from scrapy import Request, Spider
@@ -30,7 +30,6 @@ def __init__(self, proxy_settings: dict) -> None:
3030
3131
Args:
3232
proxy_settings: Dictionary containing proxy settings, provided by the Actor input.
33-
auth_encoding: Encoding for basic authentication (default is 'latin-1').
3433
"""
3534
self._proxy_settings = proxy_settings
3635
self._proxy_cfg_internal: ProxyConfiguration | None = None
@@ -111,7 +110,7 @@ def process_exception(
111110
if isinstance(exception, TunnelError):
112111
Actor.log.warning(
113112
f'ApifyHttpProxyMiddleware: TunnelError occurred for request="{request}", '
114-
'reason="{exception}", skipping...'
113+
f'reason="{exception}", skipping...'
115114
)
116115

117116
async def _get_new_proxy_url(self) -> ParseResult:

0 commit comments

Comments
 (0)