diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-03-21 03:08:31 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-03-21 03:08:31 (GMT) |
commit | b487e632826a45bb81925d1577856637c3fcafa0 (patch) | |
tree | ea4ab6c3c4a4f794ba9421f43ecdd8d05395d61a | |
parent | 16f966ee2618f7a6604b94de2e478637676f550e (diff) | |
download | cpython-b487e632826a45bb81925d1577856637c3fcafa0.zip cpython-b487e632826a45bb81925d1577856637c3fcafa0.tar.gz cpython-b487e632826a45bb81925d1577856637c3fcafa0.tar.bz2 |
stringio doesn't have an encoding
-rw-r--r-- | Lib/_pyio.py | 4 | ||||
-rw-r--r-- | Lib/test/test_memoryio.py | 2 | ||||
-rw-r--r-- | Modules/_stringio.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 771d4ce..5a7d2ca 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1834,3 +1834,7 @@ class StringIO(TextIOWrapper): # TextIOWrapper tells the encoding in its repr. In StringIO, # that's a implementation detail. return object.__repr__(self) + + @property + def encoding(self): + return None diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index b3fc042..ad04613 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -451,7 +451,7 @@ class PyStringIOTest(MemoryTestMixin, MemorySeekTestMixin, unittest.TestCase): # These are just dummy values but we nevertheless check them for fear # of unexpected breakage. - self.assertEqual(memio.encoding, "utf-8") + self.assertTrue(memio.encoding is None) self.assertEqual(memio.errors, "strict") self.assertEqual(memio.line_buffering, False) diff --git a/Modules/_stringio.c b/Modules/_stringio.c index a88fcb7..d75a604 100644 --- a/Modules/_stringio.c +++ b/Modules/_stringio.c @@ -665,7 +665,7 @@ stringio_encoding(StringIOObject *self, void *context) { CHECK_INITIALIZED(self); CHECK_CLOSED(self); - return PyUnicode_FromString("utf-8"); + Py_RETURN_NONE; } static PyObject * |