Issue #3772: Fixed regression problem in StreamHandler.emit().
This commit is contained in:
parent
a0b7444f68
commit
65d66e1006
|
@ -757,7 +757,7 @@ class StreamHandler(Handler):
|
||||||
self.stream.write(fs % msg)
|
self.stream.write(fs % msg)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
if hasattr(self.stream, 'encoding'):
|
if getattr(self.stream, 'encoding', None) is not None:
|
||||||
self.stream.write(fs % msg.encode(self.stream.encoding))
|
self.stream.write(fs % msg.encode(self.stream.encoding))
|
||||||
else:
|
else:
|
||||||
self.stream.write(fs % msg)
|
self.stream.write(fs % msg)
|
||||||
|
|
|
@ -859,6 +859,31 @@ class MemoryTest(BaseTest):
|
||||||
('foo', 'DEBUG', '3'),
|
('foo', 'DEBUG', '3'),
|
||||||
])
|
])
|
||||||
|
|
||||||
|
class EncodingTest(BaseTest):
|
||||||
|
def test_encoding_plain_file(self):
|
||||||
|
# In Python 2.x, a plain file object is treated as having no encoding.
|
||||||
|
log = logging.getLogger("test")
|
||||||
|
fn = tempfile.mktemp(".log")
|
||||||
|
# the non-ascii data we write to the log.
|
||||||
|
data = "foo\x80"
|
||||||
|
try:
|
||||||
|
handler = logging.FileHandler(fn)
|
||||||
|
log.addHandler(handler)
|
||||||
|
try:
|
||||||
|
# write non-ascii data to the log.
|
||||||
|
log.warning(data)
|
||||||
|
finally:
|
||||||
|
log.removeHandler(handler)
|
||||||
|
handler.close()
|
||||||
|
# check we wrote exactly those bytes, ignoring trailing \n etc
|
||||||
|
f = open(fn)
|
||||||
|
try:
|
||||||
|
self.failUnlessEqual(f.read().rstrip(), data)
|
||||||
|
finally:
|
||||||
|
f.close()
|
||||||
|
finally:
|
||||||
|
if os.path.isfile(fn):
|
||||||
|
os.remove(fn)
|
||||||
|
|
||||||
# Set the locale to the platform-dependent default. I have no idea
|
# Set the locale to the platform-dependent default. I have no idea
|
||||||
# why the test does this, but in any case we save the current locale
|
# why the test does this, but in any case we save the current locale
|
||||||
|
@ -867,7 +892,8 @@ class MemoryTest(BaseTest):
|
||||||
def test_main():
|
def test_main():
|
||||||
run_unittest(BuiltinLevelsTest, BasicFilterTest,
|
run_unittest(BuiltinLevelsTest, BasicFilterTest,
|
||||||
CustomLevelsAndFiltersTest, MemoryHandlerTest,
|
CustomLevelsAndFiltersTest, MemoryHandlerTest,
|
||||||
ConfigFileTest, SocketHandlerTest, MemoryTest)
|
ConfigFileTest, SocketHandlerTest, MemoryTest,
|
||||||
|
EncodingTest)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
test_main()
|
test_main()
|
||||||
|
|
|
@ -56,6 +56,8 @@ C-API
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #3772: Fixed regression problem in StreamHandler.emit().
|
||||||
|
|
||||||
- Issue 600362: Relocated parse_qs() and parse_qsl(), from the cgi module
|
- Issue 600362: Relocated parse_qs() and parse_qsl(), from the cgi module
|
||||||
to the urlparse one. Added a PendingDeprecationWarning in the old
|
to the urlparse one. Added a PendingDeprecationWarning in the old
|
||||||
module, it will be deprecated in the future.
|
module, it will be deprecated in the future.
|
||||||
|
|
Loading…
Reference in New Issue