From f53a3a56e2d128dc665a20d857b85de0497a1869 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 11:19:03 +0200
Subject: [PATCH] Bump treq from 23.11.0 to 24.9.1 (#17744)
Bumps [treq](https://github.com/twisted/treq) from 23.11.0 to 24.9.1.
Release notes
Sourced from treq's
releases.
Treq 24.9.0
Features
- treq now ships type annotations. (#366)
- The new
treq.cookies module provides helper functions
for working with http.cookiejar.Cookie and
CookieJar objects. (#384)
- Python 3.13 is now supported. (#391)
Bugfixes
treq.content.text_content() no longer generates
deprecation warnings due to use of the cgi module. (#355)
Deprecations and Removals
- Mixing the json argument with files or
data now raises
TypeError. (#297)
- Passing non-string (
str or bytes) values
as part of a dict to the headers argument now results in a
TypeError, as does passing any collection other than a
dict or Headers instance. (#302)
- Support for Python 3.7 and PyPy 3.8, which have reached end of
support, has been dropped. (#378)
Misc
Changelog
Sourced from treq's
changelog.
24.9.1 (2024-09-19)
Bugfixes
- treq has vendored its dependency on the
multipart
library to avoid import
conflicts with python-multipart; it should now be
installable alongside
that library. ([#399](https://github.com/twisted/treq/issues/399)
<https://github.com/twisted/treq/issues/399>__)
24.9.0 (2024-09-17)
Features
- treq now ships type annotations.
(
[#366](https://github.com/twisted/treq/issues/366)
<https://github.com/twisted/treq/issues/366>__)
- The new :mod:
treq.cookies module provides helper
functions for working with http.cookiejar.Cookie and
CookieJar objects.
([#384](https://github.com/twisted/treq/issues/384)
<https://github.com/twisted/treq/issues/384>__)
- Python 3.13 is now supported.
(
[#391](https://github.com/twisted/treq/issues/391)
<https://github.com/twisted/treq/issues/391>__)
Bugfixes
- :mod:
treq.content.text_content() no longer generates
deprecation warnings due to use of the cgi module.
([#355](https://github.com/twisted/treq/issues/355)
<https://github.com/twisted/treq/issues/355>__)
Deprecations and Removals
- Mixing the json argument with files or
data now raises
TypeError.
([#297](https://github.com/twisted/treq/issues/297)
<https://github.com/twisted/treq/issues/297>__)
- Passing non-string (
str or bytes) values
as part of a dict to the headers argument now results in a
TypeError, as does passing any collection other than a
dict or Headers instance.
([#302](https://github.com/twisted/treq/issues/302)
<https://github.com/twisted/treq/issues/302>__)
- Support for Python 3.7 and PyPy 3.8, which have reached end of
support, has been dropped.
(
[#378](https://github.com/twisted/treq/issues/378)
<https://github.com/twisted/treq/issues/378>__)
Misc
[#336](https://github.com/twisted/treq/issues/336)
<https://github.com/twisted/treq/issues/336>,
[#382](https://github.com/twisted/treq/issues/382)
<https://github.com/twisted/treq/issues/382>,
[#395](https://github.com/twisted/treq/issues/395)
<https://github.com/twisted/treq/issues/395>__
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Quentin Gliech
---
changelog.d/17744.misc | 1 +
poetry.lock | 9 +++++----
synapse/http/matrixfederationclient.py | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 changelog.d/17744.misc
diff --git a/changelog.d/17744.misc b/changelog.d/17744.misc
new file mode 100644
index 000000000..e4f7cc8ef
--- /dev/null
+++ b/changelog.d/17744.misc
@@ -0,0 +1 @@
+Fix typing of a variable that is not `Unknown` anymore after updating `treq`.
diff --git a/poetry.lock b/poetry.lock
index e1f8ec327..0f2ee8cac 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2587,13 +2587,13 @@ dev = ["furo (>=2024.05.06)", "nox", "packaging", "sphinx (>=5)", "twisted"]
[[package]]
name = "treq"
-version = "23.11.0"
+version = "24.9.1"
description = "High-level Twisted HTTP Client API"
optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
files = [
- {file = "treq-23.11.0-py3-none-any.whl", hash = "sha256:f494c2218d61cab2cabbee37cd6606d3eea9d16cf14190323095c95d22c467e9"},
- {file = "treq-23.11.0.tar.gz", hash = "sha256:0914ff929fd1632ce16797235260f8bc19d20ff7c459c1deabd65b8c68cbeac5"},
+ {file = "treq-24.9.1-py3-none-any.whl", hash = "sha256:eee4756fd9a857c77f180fd5202b52c518f2d3e2826dce28b89066c03bfc45d0"},
+ {file = "treq-24.9.1.tar.gz", hash = "sha256:15da7fc404f3e4ed59d0abe5f8eef4966fabbe618039a2a23bc7c15305cefea8"},
]
[package.dependencies]
@@ -2602,6 +2602,7 @@ hyperlink = ">=21.0.0"
incremental = "*"
requests = ">=2.1.0"
Twisted = {version = ">=22.10.0", extras = ["tls"]}
+typing-extensions = ">=3.10.0"
[package.extras]
dev = ["httpbin (==0.7.0)", "pep8", "pyflakes", "werkzeug (==2.0.3)"]
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index b9ecdc273..e658c68e2 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -791,7 +791,7 @@ class MatrixFederationHttpClient:
url_str,
_flatten_response_never_received(e),
)
- body = None
+ body = b""
exc = HttpResponseException(
response.code, response_phrase, body