Merge pull request #752 from alexwlchan/yet-more-h2-deprecations

A few more h2.errors instances in twisted Author: alexwlchan Reviewer: Lukasa Fixes: ticket:9093
twisted · Mar 23, 2017 · b00178a · b00178a
2 parents 4a99414 + 62a91dd
commit b00178a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/twisted/web/test/test_http2.py b/src/twisted/web/test/test_http2.py
@@ -2060,7 +2060,7 @@ def test_dataAndRstStream(self):
         del frames[-1]
         frames.append(
             frameFactory.buildRstStreamFrame(
-                streamID=1, errorCode=h2.errors.INTERNAL_ERROR
+                streamID=1, errorCode=h2.errors.ErrorCodes.INTERNAL_ERROR
             )
         )
 
@@ -2394,7 +2394,7 @@ def prepareAbortTest(self, abortTimeout=_DEFAULT):
         self.assertTimedOut(
             transport.value(),
             frameCount=2,
-            errorCode=h2.errors.NO_ERROR,
+            errorCode=h2.errors.ErrorCodes.NO_ERROR,
             lastStreamID=0
         )
         self.assertTrue(transport.disconnecting)
@@ -2431,7 +2431,7 @@ def test_timeoutAfterInactivity(self):
         self.assertTimedOut(
             transport.value(),
             frameCount=2,
-            errorCode=h2.errors.NO_ERROR,
+            errorCode=h2.errors.ErrorCodes.NO_ERROR,
             lastStreamID=0
         )
         self.assertTrue(transport.disconnecting)
@@ -2465,7 +2465,7 @@ def test_timeoutResetByData(self):
         self.assertTimedOut(
             transport.value(),
             frameCount=2,
-            errorCode=h2.errors.NO_ERROR,
+            errorCode=h2.errors.ErrorCodes.NO_ERROR,
             lastStreamID=0
         )
         self.assertTrue(transport.disconnecting)
@@ -2474,7 +2474,7 @@ def test_timeoutResetByData(self):
     def test_timeoutWithProtocolErrorIfStreamsOpen(self):
         """
         When a L{H2Connection} times out with active streams, the error code
-        returned is L{h2.errors.PROTOCOL_ERROR}.
+        returned is L{h2.errors.ErrorCodes.PROTOCOL_ERROR}.
         """
         frameFactory = FrameFactory()
         frames = buildRequestFrames(self.getRequestHeaders, [], frameFactory)
@@ -2491,7 +2491,7 @@ def test_timeoutWithProtocolErrorIfStreamsOpen(self):
         self.assertTimedOut(
             transport.value(),
             frameCount=2,
-            errorCode=h2.errors.PROTOCOL_ERROR,
+            errorCode=h2.errors.ErrorCodes.PROTOCOL_ERROR,
             lastStreamID=1
         )
         self.assertTrue(transport.disconnecting)

diff --git a/src/twisted/web/topfiles/9093.misc b/src/twisted/web/topfiles/9093.misc