浏览代码

Bump `black` and `click` versions (#12320)

tags/v1.57.0rc1
David Robertson 2 年前
committed by GitHub
父节点
当前提交
a2b00a4486
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 16 个文件被更改,包括 37 次插入30 次删除
  1. +1
    -0
      changelog.d/12320.misc
  2. +9
    -6
      contrib/jitsimeetbridge/jitsimeetbridge.py
  3. +2
    -2
      setup.py
  4. +1
    -1
      synapse/api/constants.py
  5. +1
    -1
      synapse/appservice/scheduler.py
  6. +1
    -1
      synapse/crypto/keyring.py
  7. +1
    -1
      synapse/events/utils.py
  8. +1
    -1
      synapse/http/proxyagent.py
  9. +1
    -1
      synapse/replication/http/_base.py
  10. +1
    -1
      synapse/rest/media/v1/media_storage.py
  11. +2
    -2
      synapse/rest/media/v1/preview_html.py
  12. +1
    -1
      synapse/storage/database.py
  13. +10
    -7
      synapse/util/patch_inline_callbacks.py
  14. +1
    -1
      synapse/util/retryutils.py
  15. +3
    -3
      tests/handlers/test_federation.py
  16. +1
    -1
      tests/replication/_base.py

+ 1
- 0
changelog.d/12320.misc 查看文件

@@ -0,0 +1 @@
Bump the version of `black` for compatibility with the latest `click` release.

+ 9
- 6
contrib/jitsimeetbridge/jitsimeetbridge.py 查看文件

@@ -193,12 +193,15 @@ class TrivialXmppClient:
time.sleep(7)
print("SSRC spammer started")
while self.running:
ssrcMsg = "<presence to='%(tojid)s' xmlns='jabber:client'><x xmlns='http://jabber.org/protocol/muc'/><c xmlns='http://jabber.org/protocol/caps' hash='sha-1' node='http://jitsi.org/jitsimeet' ver='0WkSdhFnAUxrz4ImQQLdB80GFlE='/><nick xmlns='http://jabber.org/protocol/nick'>%(nick)s</nick><stats xmlns='http://jitsi.org/jitmeet/stats'><stat name='bitrate_download' value='175'/><stat name='bitrate_upload' value='176'/><stat name='packetLoss_total' value='0'/><stat name='packetLoss_download' value='0'/><stat name='packetLoss_upload' value='0'/></stats><media xmlns='http://estos.de/ns/mjs'><source type='audio' ssrc='%(assrc)s' direction='sendre'/><source type='video' ssrc='%(vssrc)s' direction='sendre'/></media></presence>" % {
"tojid": "%s@%s/%s" % (ROOMNAME, ROOMDOMAIN, self.shortJid),
"nick": self.userId,
"assrc": self.ssrcs["audio"],
"vssrc": self.ssrcs["video"],
}
ssrcMsg = (
"<presence to='%(tojid)s' xmlns='jabber:client'><x xmlns='http://jabber.org/protocol/muc'/><c xmlns='http://jabber.org/protocol/caps' hash='sha-1' node='http://jitsi.org/jitsimeet' ver='0WkSdhFnAUxrz4ImQQLdB80GFlE='/><nick xmlns='http://jabber.org/protocol/nick'>%(nick)s</nick><stats xmlns='http://jitsi.org/jitmeet/stats'><stat name='bitrate_download' value='175'/><stat name='bitrate_upload' value='176'/><stat name='packetLoss_total' value='0'/><stat name='packetLoss_download' value='0'/><stat name='packetLoss_upload' value='0'/></stats><media xmlns='http://estos.de/ns/mjs'><source type='audio' ssrc='%(assrc)s' direction='sendre'/><source type='video' ssrc='%(vssrc)s' direction='sendre'/></media></presence>"
% {
"tojid": "%s@%s/%s" % (ROOMNAME, ROOMDOMAIN, self.shortJid),
"nick": self.userId,
"assrc": self.ssrcs["audio"],
"vssrc": self.ssrcs["video"],
}
)
res = self.sendIq(ssrcMsg)
print("reply from ssrc announce: ", res)
time.sleep(10)


+ 2
- 2
setup.py 查看文件

@@ -95,7 +95,7 @@ CONDITIONAL_REQUIREMENTS["all"] = list(ALL_OPTIONAL_REQUIREMENTS)
# We pin black so that our tests don't start failing on new releases.
CONDITIONAL_REQUIREMENTS["lint"] = [
"isort==5.7.0",
"black==21.12b0",
"black==22.3.0",
"flake8-comprehensions",
"flake8-bugbear==21.3.2",
"flake8",
@@ -128,7 +128,7 @@ CONDITIONAL_REQUIREMENTS["dev"] = (
+ CONDITIONAL_REQUIREMENTS["test"]
+ [
# The following are used by the release script
"click==7.1.2",
"click==8.1.0",
"redbaron==0.9.2",
"GitPython==3.1.14",
"commonmark==0.9.1",


+ 1
- 1
synapse/api/constants.py 查看文件

@@ -23,7 +23,7 @@ from typing_extensions import Final
MAX_PDU_SIZE = 65536

# the "depth" field on events is limited to 2**63 - 1
MAX_DEPTH = 2 ** 63 - 1
MAX_DEPTH = 2**63 - 1

# the maximum length for a room alias is 255 characters
MAX_ALIAS_LENGTH = 255


+ 1
- 1
synapse/appservice/scheduler.py 查看文件

@@ -428,7 +428,7 @@ class _Recoverer:
"as-recoverer-%s" % (self.service.id,), self.retry
)

delay = 2 ** self.backoff_counter
delay = 2**self.backoff_counter
logger.info("Scheduling retries on %s in %fs", self.service.id, delay)
self.clock.call_later(delay, _retry)



+ 1
- 1
synapse/crypto/keyring.py 查看文件

@@ -182,7 +182,7 @@ class Keyring:
vk = get_verify_key(hs.signing_key)
self._local_verify_keys[f"{vk.alg}:{vk.version}"] = FetchKeyResult(
verify_key=vk,
valid_until_ts=2 ** 63, # fake future timestamp
valid_until_ts=2**63, # fake future timestamp
)

async def verify_json_for_server(


+ 1
- 1
synapse/events/utils.py 查看文件

@@ -49,7 +49,7 @@ if TYPE_CHECKING:
# the literal fields "foo\" and "bar" but will instead be treated as "foo\\.bar"
SPLIT_FIELD_REGEX = re.compile(r"(?<!\\)\.")

CANONICALJSON_MAX_INT = (2 ** 53) - 1
CANONICALJSON_MAX_INT = (2**53) - 1
CANONICALJSON_MIN_INT = -CANONICALJSON_MAX_INT




+ 1
- 1
synapse/http/proxyagent.py 查看文件

@@ -41,7 +41,7 @@ from synapse.types import ISynapseReactor

logger = logging.getLogger(__name__)

_VALID_URI = re.compile(br"\A[\x21-\x7e]+\Z")
_VALID_URI = re.compile(rb"\A[\x21-\x7e]+\Z")


@implementer(IAgent)


+ 1
- 1
synapse/replication/http/_base.py 查看文件

@@ -275,7 +275,7 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta):
if attempts > cls.RETRY_ON_CONNECT_ERROR_ATTEMPTS:
raise

delay = 2 ** attempts
delay = 2**attempts
logger.warning(
"%s request connection failed; retrying in %ds: %r",
cls.NAME,


+ 1
- 1
synapse/rest/media/v1/media_storage.py 查看文件

@@ -352,7 +352,7 @@ class ReadableFileWrapper:
`IConsumer`.
"""

CHUNK_SIZE = 2 ** 14
CHUNK_SIZE = 2**14

clock: Clock
path: str


+ 2
- 2
synapse/rest/media/v1/preview_html.py 查看文件

@@ -23,10 +23,10 @@ if TYPE_CHECKING:
logger = logging.getLogger(__name__)

_charset_match = re.compile(
br'<\s*meta[^>]*charset\s*=\s*"?([a-z0-9_-]+)"?', flags=re.I
rb'<\s*meta[^>]*charset\s*=\s*"?([a-z0-9_-]+)"?', flags=re.I
)
_xml_encoding_match = re.compile(
br'\s*<\s*\?\s*xml[^>]*encoding="([a-z0-9_-]+)"', flags=re.I
rb'\s*<\s*\?\s*xml[^>]*encoding="([a-z0-9_-]+)"', flags=re.I
)
_content_type_match = re.compile(r'.*; *charset="?(.*?)"?(;|$)', flags=re.I)



+ 1
- 1
synapse/storage/database.py 查看文件

@@ -63,7 +63,7 @@ if TYPE_CHECKING:
from synapse.server import HomeServer

# python 3 does not have a maximum int value
MAX_TXN_ID = 2 ** 63 - 1
MAX_TXN_ID = 2**63 - 1

logger = logging.getLogger(__name__)



+ 10
- 7
synapse/util/patch_inline_callbacks.py 查看文件

@@ -217,13 +217,16 @@ def _check_yield_points(
# We don't raise here as its perfectly valid for contexts to
# change in a function, as long as it sets the correct context
# on resolving (which is checked separately).
err = "%s changed context from %s to %s, happened between lines %d and %d in %s" % (
frame.f_code.co_name,
expected_context,
current_context(),
last_yield_line_no,
frame.f_lineno,
frame.f_code.co_filename,
err = (
"%s changed context from %s to %s, happened between lines %d and %d in %s"
% (
frame.f_code.co_name,
expected_context,
current_context(),
last_yield_line_no,
frame.f_lineno,
frame.f_code.co_filename,
)
)
changes.append(err)



+ 1
- 1
synapse/util/retryutils.py 查看文件

@@ -30,7 +30,7 @@ MIN_RETRY_INTERVAL = 10 * 60 * 1000
RETRY_MULTIPLIER = 5

# a cap on the backoff. (Essentially none)
MAX_RETRY_INTERVAL = 2 ** 62
MAX_RETRY_INTERVAL = 2**62


class NotRetryingDestination(Exception):


+ 3
- 3
tests/handlers/test_federation.py 查看文件

@@ -496,8 +496,8 @@ class EventFromPduTestCase(TestCase):
def test_invalid_numbers(self) -> None:
"""Invalid values for an integer should be rejected, all floats should be rejected."""
for value in [
-(2 ** 53),
2 ** 53,
-(2**53),
2**53,
1.0,
float("inf"),
float("-inf"),
@@ -524,7 +524,7 @@ class EventFromPduTestCase(TestCase):
event_from_pdu_json(
{
"type": EventTypes.Message,
"content": {"foo": [{"bar": 2 ** 56}]},
"content": {"foo": [{"bar": 2**56}]},
"room_id": "!room:test",
"sender": "@user:test",
"depth": 1,


+ 1
- 1
tests/replication/_base.py 查看文件

@@ -206,7 +206,7 @@ class BaseStreamTestCase(unittest.HomeserverTestCase):
path: bytes = request.path # type: ignore
self.assertRegex(
path,
br"^/_synapse/replication/get_repl_stream_updates/%s/[^/]+$"
rb"^/_synapse/replication/get_repl_stream_updates/%s/[^/]+$"
% (stream_name.encode("ascii"),),
)



正在加载...
取消
保存