LADI
/
py-twisted
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-20.3-9772' of github.com:twisted/twisted into release-20.3-9772

This commit is contained in:
Amber H. Brown 2020-03-18 19:32:11 +11:00
parent b9f8dad871 384de5918e
commit 121c98e006
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.rst
View File

@ -3,8 +3,8 @@ http://twistedmatrix.com/trac/ticket/<number>
.. towncrier release notes start
Twisted 20.3.0rc1 (2020-03-08)
==============================
Twisted 20.3.0 (2020-03-13)
===========================
Bugfixes
--------

2
src/twisted/__init__.py
View File

@ -16,7 +16,7 @@ __version__ = version.short()
from incremental import Version
from twisted.python.deprecate import deprecatedModuleAttribute
deprecatedModuleAttribute(
Version('Twisted', 20, 3, 0, release_candidate=1),
Version('Twisted', 20, 3, 0),
"morituri nolumus mori",
"twisted",
"news"

2
src/twisted/_version.py
View File

@ -7,5 +7,5 @@ Provides Twisted version information.
from incremental import Version
__version__ = Version('Twisted', 20, 3, 0, release_candidate=1)
__version__ = Version('Twisted', 20, 3, 0)
__all__ = ["__version__"]

8
src/twisted/conch/ssh/keys.py
View File

@ -1209,7 +1209,7 @@ class Key(object):
@param extra: Any extra data supported by the selected format which
is not part of the key itself. For public OpenSSH keys, this is
a comment. For private OpenSSH keys, this is a passphrase to
encrypt with. (Deprecated since Twisted 20.3.0rc1; use C{comment}
encrypt with. (Deprecated since Twisted 20.3.0; use C{comment}
or C{passphrase} as appropriate instead.)
@type extra: L{bytes} or L{unicode} or L{None}
@ -1222,14 +1222,14 @@ class Key(object):
@param comment: A comment to include with the key. Only supported
for OpenSSH keys.
Present since Twisted 20.3.0rc1.
Present since Twisted 20.3.0.
@type comment: L{bytes} or L{unicode} or L{None}
@param passphrase: A passphrase to encrypt the key with. Only
supported for private OpenSSH keys.
Present since Twisted 20.3.0rc1.
Present since Twisted 20.3.0.
@type passphrase: L{bytes} or L{unicode} or L{None}
@ -1240,7 +1240,7 @@ class Key(object):
warnings.warn(
"The 'extra' argument to "
"twisted.conch.ssh.keys.Key.toString was deprecated in "
"Twisted 20.3.0rc1; use 'comment' or 'passphrase' instead.",
"Twisted 20.3.0; use 'comment' or 'passphrase' instead.",
DeprecationWarning, stacklevel=3)
if self.isPublic():
comment = extra

2
src/twisted/names/dns.py
View File

@ -269,7 +269,7 @@ def domainString(domain):
@returns: L{bytes} suitable for network transmission.
@rtype: L{bytes}
@since: Twisted 20.3.0rc1
@since: Twisted 20.3.0
"""
if isinstance(domain, unicode):
domain = domain.encode('idna')

2
src/twisted/test/test_news.py
View File

@ -26,7 +26,7 @@ class NewsDeprecationTestCase(SynchronousTestCase):
self.assertEqual(
warningsShown[0]['message'],
(
'twisted.news was deprecated in Twisted 20.3.0rc1: '
'twisted.news was deprecated in Twisted 20.3.0: '
'morituri nolumus mori'
)
)