From 00ddb1c84a6df6aa0ab86c1e1bb24f0a3d21ff5f Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Wed, 19 Jul 2017 10:28:43 -0700 Subject: [PATCH] encodings: IncrementalEncoder and Decoder concrete (#1490) These stubs are identical in Python 2 and 3, but I believe they should not be merged, because there are numerous other modules in the encodings package, and some only exist in some Python versions. I don't think we can support that in the 2and3 directory. --- stdlib/2/encodings/utf_8.pyi | 17 +++++++++-------- stdlib/3/encodings/utf_8.pyi | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/stdlib/2/encodings/utf_8.pyi b/stdlib/2/encodings/utf_8.pyi index 0111184b7..d38bd58d0 100644 --- a/stdlib/2/encodings/utf_8.pyi +++ b/stdlib/2/encodings/utf_8.pyi @@ -1,14 +1,15 @@ import codecs +from typing import Text, Tuple class IncrementalEncoder(codecs.IncrementalEncoder): - pass + def encode(self, input: Text, final: bool = ...) -> bytes: ... + class IncrementalDecoder(codecs.BufferedIncrementalDecoder): - pass -class StreamWriter(codecs.StreamWriter): - pass -class StreamReader(codecs.StreamReader): - pass + def _buffer_decode(self, input: bytes, errors: str, final: bool) -> Tuple[Text, int]: ... + +class StreamWriter(codecs.StreamWriter): ... +class StreamReader(codecs.StreamReader): ... def getregentry() -> codecs.CodecInfo: ... -def encode(input: str, errors: str = ...) -> bytes: ... -def decode(input: bytes, errors: str = ...) -> str: ... +def encode(input: Text, errors: Text = ...) -> bytes: ... +def decode(input: bytes, errors: Text = ...) -> Text: ... diff --git a/stdlib/3/encodings/utf_8.pyi b/stdlib/3/encodings/utf_8.pyi index 0111184b7..d38bd58d0 100644 --- a/stdlib/3/encodings/utf_8.pyi +++ b/stdlib/3/encodings/utf_8.pyi @@ -1,14 +1,15 @@ import codecs +from typing import Text, Tuple class IncrementalEncoder(codecs.IncrementalEncoder): - pass + def encode(self, input: Text, final: bool = ...) -> bytes: ... + class IncrementalDecoder(codecs.BufferedIncrementalDecoder): - pass -class StreamWriter(codecs.StreamWriter): - pass -class StreamReader(codecs.StreamReader): - pass + def _buffer_decode(self, input: bytes, errors: str, final: bool) -> Tuple[Text, int]: ... + +class StreamWriter(codecs.StreamWriter): ... +class StreamReader(codecs.StreamReader): ... def getregentry() -> codecs.CodecInfo: ... -def encode(input: str, errors: str = ...) -> bytes: ... -def decode(input: bytes, errors: str = ...) -> str: ... +def encode(input: Text, errors: Text = ...) -> bytes: ... +def decode(input: bytes, errors: Text = ...) -> Text: ...