Merge branch 'trunk' into 6607

docs/community.rst

@@ -0,0 +1,42 @@
+Twisted Community
+#################
+
+For interacting with the twisted community members, you have several options:
+
+Mail Lists
+==========
+
+If you want to participate in Twisted's community or development, you probably want to join the main mailing list:
+
+- `twisted-python <https://mail.python.org/mailman3/lists/twisted.python.org/>`_ - the main Twisted discussion list
+
+You can subscribe to the mailing list using the web interface linked above.
+
+ML Archives:
+
+- `Current list archive <https://mail.python.org/archives/list/twisted@python.org/>`_
+- `Other archives <https://github.com/twisted/pipermail>`_
+
+Stack Overflow
+==============
+
+Stack Overflow is a programming Q & A site.  You can find Twisted-related questions there, often with answers:
+
+- https://stackoverflow.com/questions/tagged/twisted
+
+Real-Time Chat
+==============
+
+You can join the `Twisted Gitter channel <https://gitter.im/twisted/twisted>`_ (or simply click the "Open Chat" button at the bottom-right of this screen).
+Gitter is based on `Matrix <https://matrix.org/>`_, which is itself built with Twisted !
+
+Alternatively you can join the following IRC channel. There are gateways between the Gitter and IRC channels.
+
+Server: ``irc.libera.chat`` (more about `the Libera IRC network <https://libera.chat>`_)
+
+- `#twisted <irc://irc.libera.chat/twisted>`_  - support for Twisted and its ecosystem
+
+Blogs
+=====
+
+Read `Planet Twisted <https://planet.twistedmatrix.com/>`_.

docs/index.rst

@@ -28,6 +28,7 @@ Contents:
    :caption: Quick links
 
    security
+   community
    api/index
    GitHub <https://github.com/twisted/twisted>
-   PyPI <https://pypi.org/project/twisted>
+   PyPI <https://pypi.org/project/twisted>

docs/mail/examples/emailserver.tac

@@ -62,7 +62,7 @@ class ConsoleSMTPFactory(smtp.SMTPFactory):
     def buildProtocol(self, addr):
         p = smtp.SMTPFactory.buildProtocol(self, addr)
         p.delivery = self.delivery
-        p.challengers = {"LOGIN": LOGINCredentials, "PLAIN": PLAINCredentials}
+        p.challengers = {b"LOGIN": LOGINCredentials, b"PLAIN": PLAINCredentials}
         return p
 
 

src/twisted/mail/newsfragments/11634.bugfix

@@ -0,0 +1 @@
+emailserver.tac now runs under python3.x