Skip to content

Commit ba2a193

Browse files
authored
Merge pull request #1720 from timgates42/bugfix_typo_renegotiation
docs: Fix simple typo, renegotation -> renegotiation
2 parents 5933a9a + 7e9c5b7 commit ba2a193

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

trio/_ssl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
# able to use this to figure out the key. Is this a real practical problem? I
7070
# have no idea, I'm not a cryptographer. In any case, some people worry that
7171
# it's a problem, so their TLS libraries are designed to automatically trigger
72-
# a renegotation every once in a while on some sort of timer.
72+
# a renegotiation every once in a while on some sort of timer.
7373
#
7474
# The end result is that you might be going along, minding your own business,
7575
# and then *bam*! a wild renegotiation appears! And you just have to cope.
@@ -542,7 +542,7 @@ async def _retry(self, fn, *args, ignore_want_read=False, is_handshake=False):
542542
# We could do something tricky to keep track of whether a
543543
# receive_some happens while we're sending, but the case where
544544
# we have to do both is very unusual (only during a
545-
# renegotation), so it's better to keep things simple. So we
545+
# renegotiation), so it's better to keep things simple. So we
546546
# do just one potentially-blocking operation, then check again
547547
# for fresh information.
548548
#

trio/tests/test_ssl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def renegotiate_pending(self):
231231
return self._conn.renegotiate_pending()
232232

233233
def renegotiate(self):
234-
# Returns false if a renegotation is already in progress, meaning
234+
# Returns false if a renegotiation is already in progress, meaning
235235
# nothing happens.
236236
assert self._conn.renegotiate()
237237

@@ -323,7 +323,7 @@ async def receive_some(self, nbytes=None):
323323
async def test_PyOpenSSLEchoStream_gives_resource_busy_errors():
324324
# Make sure that PyOpenSSLEchoStream complains if two tasks call send_all
325325
# at the same time, or ditto for receive_some. The tricky cases where SSLStream
326-
# might accidentally do this are during renegotation, which we test using
326+
# might accidentally do this are during renegotiation, which we test using
327327
# PyOpenSSLEchoStream, so this makes sure that if we do have a bug then
328328
# PyOpenSSLEchoStream will notice and complain.
329329

0 commit comments

Comments
 (0)