Skip to content

Fixing Stream.__repr__ to match CPython #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pamelafox merged 3 commits into from
Sep 23, 2022
Merged

Fixing Stream.__repr__ to match CPython #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf4e20f
Stream repr
pamelafox Sep 23, 2022
ef8d230
Use Str
pamelafox Sep 23, 2022
ebf0963
Blackify
pamelafox Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/picologging/streamhandler.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "streamhandler.hxx"
#include "handler.hxx"
#include "compat.hxx"
#include "picologging.hxx"

PyObject* StreamHandler_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
{
Expand Down Expand Up @@ -106,6 +107,15 @@ PyObject* StreamHandler_flush(StreamHandler* self, PyObject* const* args, Py_ssi
Py_RETURN_NONE;
}

PyObject* StreamHandler_repr(StreamHandler *self)
{
std::string level = _getLevelName(self->handler.level);
return PyUnicode_FromFormat("<%s %U (%s)>",
_PyType_Name(Py_TYPE(self)),
PyObject_Str(PyObject_GetAttrString(self->stream, "name")),
level.c_str());
}

static PyMethodDef StreamHandler_methods[] = {
{"emit", (PyCFunction)StreamHandler_emit, METH_FASTCALL, "Emit a record."},
{"flush", (PyCFunction)StreamHandler_flush, METH_FASTCALL, "Flush the stream."},
Expand All @@ -128,7 +138,7 @@ PyTypeObject StreamHandlerType = {
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
(reprfunc)StreamHandler_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
Expand Down
16 changes: 16 additions & 0 deletions tests/unit/test_streamhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,19 @@ def test_set_stream_return_value():
# test that setting to existing value returns None
actual = h.setStream(old)
assert actual is None


def test_streamhandler_repr():
class StreamWithName(object):
level = picologging.NOTSET
name = "beyonce"

handler = picologging.StreamHandler(StreamWithName())
assert repr(handler) == "<StreamHandler beyonce (NOTSET)>"

class StreamWithIntName(object):
level = picologging.NOTSET
name = 2

handler = picologging.StreamHandler(StreamWithIntName())
assert repr(handler) == "<StreamHandler 2 (NOTSET)>"