From 24467171f5561d5866c93095165b052e56153daa Mon Sep 17 00:00:00 2001 From: Alex Chan Date: Tue, 20 Sep 2016 21:01:15 +0100 Subject: [PATCH 1/2] Drop `Headers` from the name of `_ResponseHeadersSent` --- h2/events.py | 4 ++-- h2/stream.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/h2/events.py b/h2/events.py index d52b8ff38..70b371da7 100644 --- a/h2/events.py +++ b/h2/events.py @@ -146,9 +146,9 @@ class _HeadersSent(object): pass -class _ResponseHeadersSent(_HeadersSent): +class _ResponseSent(_HeadersSent): """ - The _ResponseHeadersSent event is fired whenever response headers are sent + The _ResponseSent event is fired whenever response headers are sent on a stream. This is an internal event, used to determine validation steps on diff --git a/h2/stream.py b/h2/stream.py index ac8b05e33..c488e4f5a 100644 --- a/h2/stream.py +++ b/h2/stream.py @@ -19,7 +19,7 @@ RequestReceived, ResponseReceived, DataReceived, WindowUpdated, StreamEnded, PushedStreamReceived, StreamReset, TrailersReceived, InformationalResponseReceived, AlternativeServiceAvailable, - _HeadersSent, _ResponseHeadersSent, _TrailersSent + _HeadersSent, _ResponseSent, _TrailersSent ) from .exceptions import ( ProtocolError, StreamClosedError, InvalidBodyLengthError @@ -146,7 +146,7 @@ def response_sent(self, previous_state): if self.client is True or self.client is None: raise ProtocolError("Client cannot send responses.") self.headers_sent = True - event = _ResponseHeadersSent() + event = _ResponseSent() else: assert not self.trailers_sent self.trailers_sent = True @@ -1041,7 +1041,7 @@ def _build_hdr_validation_flags(self, events): events[0], (_TrailersSent, TrailersReceived) ) is_response_header = isinstance( - events[0], (_ResponseHeadersSent, ResponseReceived) + events[0], (_ResponseSent, ResponseReceived) ) except IndexError: # Some state changes don't emit an internal event (for example, From a3cfea31932a02bec1b0405da80111eb4a01b9d5 Mon Sep 17 00:00:00 2001 From: Alex Chan Date: Tue, 20 Sep 2016 21:07:58 +0100 Subject: [PATCH 2/2] Add a `_RequestSent` event for symmetry Make sure we actually emit it somewhere, or coverage gets cranky. --- h2/events.py | 11 +++++++++++ h2/stream.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/h2/events.py b/h2/events.py index 70b371da7..b556bc97b 100644 --- a/h2/events.py +++ b/h2/events.py @@ -157,6 +157,17 @@ class _ResponseSent(_HeadersSent): pass +class _RequestSent(_HeadersSent): + """ + The _RequestSent event is fired whenever request headers are sent + on a stream. + + This is an internal event, used to determine validation steps on + outgoing header blocks. + """ + pass + + class _TrailersSent(_HeadersSent): """ The _TrailersSent event is fired whenever trailers are sent on a diff --git a/h2/stream.py b/h2/stream.py index c488e4f5a..eae7efcc0 100644 --- a/h2/stream.py +++ b/h2/stream.py @@ -19,7 +19,7 @@ RequestReceived, ResponseReceived, DataReceived, WindowUpdated, StreamEnded, PushedStreamReceived, StreamReset, TrailersReceived, InformationalResponseReceived, AlternativeServiceAvailable, - _HeadersSent, _ResponseSent, _TrailersSent + _HeadersSent, _ResponseSent, _RequestSent, _TrailersSent ) from .exceptions import ( ProtocolError, StreamClosedError, InvalidBodyLengthError @@ -133,7 +133,7 @@ def request_sent(self, previous_state): """ self.client = True self.headers_sent = True - event = _HeadersSent() + event = _RequestSent() return [event]