Merge branch 'trunk' into 9438-py2-bytes-directory-listing

sshyran · May 7, 2018 · 688f779 · 688f779
2 parents a672a91 + 7ae6531
commit 688f779
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/twisted/internet/test/test_tcp.py b/src/twisted/internet/test/test_tcp.py
@@ -33,7 +33,7 @@
 from twisted.internet.error import (
     ConnectionLost, UserError, ConnectionRefusedError, ConnectionDone,
     ConnectionAborted, DNSLookupError, NoProtocol,
-    ConnectBindError,
+    ConnectBindError, ConnectionClosed,
 )
 from twisted.internet.test.connectionmixins import (
     LogObserverMixin, ConnectionTestsMixin, StreamClientTestsMixin,
@@ -1266,7 +1266,7 @@ def stopReactorAndCloseFileDescriptors(result):
     testCase.assertNoResult(clientFactory.failDeferred)
     testCase.successResultOf(clientFactory.deferred)
     testCase.assertRaises(
-        testCase.lostConnectionReason,
+        ConnectionClosed,
         clientFactory.lostReason.raiseException,
     )
 
@@ -1357,7 +1357,6 @@ class StreamTransportTestsMixin(LogObserverMixin):
     """
     Mixin defining tests which apply to any port/connection based transport.
     """
-    lostConnectionReason = ConnectionDone
 
     def test_startedListeningLogMessage(self):
         """

diff --git a/src/twisted/newsfragments/9439.misc b/src/twisted/newsfragments/9439.misc
diff --git a/src/twisted/web/newsfragments/9432.misc b/src/twisted/web/newsfragments/9432.misc
diff --git a/src/twisted/web/static.py b/src/twisted/web/static.py
@@ -51,6 +51,14 @@ class Data(resource.Resource):
     """
 
     def __init__(self, data, type):
+        """
+        @param data: The bytes that make up this data resource.
+        @type data: L{bytes}
+
+        @param type: A native string giving the Internet media type for this
+            content.
+        @type type: L{str}
+        """
         resource.Resource.__init__(self)
         self.data = data
         self.type = type