Ruff Linter configuring #293
Conversation
curl_cffi/curl.py
Outdated
| @@ -69,11 +69,11 @@ def write_callback(ptr, size, nmemb, userdata): | |||
| callback = ffi.from_handle(userdata) | |||
| wrote = callback(ffi.buffer(ptr, nmemb)[:]) | |||
| wrote = ensure_int(wrote) | |||
| if wrote == CURL_WRITEFUNC_PAUSE or wrote == CURL_WRITEFUNC_ERROR: | |||
| if wrote in (CURL_WRITEFUNC_PAUSE, CURL_WRITEFUNC_ERROR): | |||
There was a problem hiding this comment.
I know that in (...) is the preferred style, but this function is quite compute intensive, let's keep it the original form.
pyproject.toml
Outdated
| @@ -5,7 +5,7 @@ authors = [{ name = "Yifei Kong", email = "kong@yifei.me" }] | |||
| description = "libcurl ffi bindings for Python, with impersonation support." | |||
| license = { file = "LICENSE" } | |||
| dependencies = [ | |||
| "cffi>=1.12.0", | |||
| "cffi>=1.16.0", | |||
There was a problem hiding this comment.
I prefer to keep the dependency version as low as possible if there are no serious bugs or features only available in new versions. The cffi lib is such a common dependency for many projects, see here, raising it may cause conflicting situations for our users.
pyproject.toml
Outdated
| ] | ||
|
|
||
|
|
||
| [build-system] | ||
| requires = ["wheel", "setuptools", "cffi>=1.12.0"] | ||
| requires = ["wheel", "setuptools", "cffi>=1.16.0"] |
curl_cffi/requests/session.py
Outdated
| else: | ||
| return item | ||
| item_map = {"chrome": cls.chrome, "safari": cls.safari, "safari_ios": cls.safari_ios} | ||
| return item_map.get(item, item) |
There was a problem hiding this comment.
This function is also called quite frequently, I prefer to keep the if-else style instead of table-driven style. Perhaps, the match expression is equivlent to if-else, but that's only available in later versions.
curl_cffi/requests/session.py
Outdated
| if self.base_url: | ||
| url = urljoin(self.base_url, url) | ||
| c.setopt(CurlOpt.URL, url.encode()) | ||
|
|
||
| # data/body/json | ||
| if isinstance(data, dict): |
There was a problem hiding this comment.
Again, if-else style if preferred for performance reasons.
curl_cffi/requests/session.py
Outdated
|
|
||
| # url | ||
| if self.params: |
There was a problem hiding this comment.
This has been updated #296, parameters are not dicts.
curl_cffi/requests/session.py
Outdated
| c.setopt(CurlOpt.CUSTOMREQUEST, method.encode()) | ||
| if method == "POST": |
There was a problem hiding this comment.
For POST, setting CUSTOMREQUEST can be problematic. A common scenario is that user submits a form via POST, and the server redirects to a page that you need to GET. CurlOpt.POST is actually made for that, while CUSTOMREQUEST will send two POST requests.
tests/unittest/test_requests.py
Outdated
| @@ -567,10 +567,9 @@ def test_stream_empty_body(server): | |||
| def test_stream_incomplete_read(server): | |||
| with requests.Session() as s: | |||
| url = str(server.url.copy_with(path="/incomplete_read")) | |||
| with pytest.raises(requests.RequestsError) as e: | |||
There was a problem hiding this comment.
The nested style is preferred to show the nested environments we are creating. It's not like we are opening two files here.
tests/unittest/test_requests.py
Outdated
| @@ -590,9 +589,8 @@ def test_stream_incomplete_read_without_close(server): | |||
| def test_stream_redirect_loop(server): | |||
| with requests.Session() as s: | |||
| url = str(server.url.copy_with(path="/redirect_loop")) | |||
| with pytest.raises(requests.RequestsError) as e: | |||
|
accidentally closed |
autoflake,flake*,make lint: mypy automatically install known missing stub packages for third-party libraries,