Commit a7eb93ec authored by Walter Dörwald's avatar Walter Dörwald

Simplify socket_repr() by using PyUnicode_FromFormat()

directly. Add a test that calls socket_repr().
parent 787b03ba
......@@ -217,6 +217,10 @@ class SocketPairTest(unittest.TestCase, ThreadableTest):
class GeneralModuleTests(unittest.TestCase):
def test_repr(self):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.assert_(repr(s).startswith("<socket.socket object"))
def test_weakref(self):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
p = proxy(s)
......
......@@ -2787,13 +2787,11 @@ sock_repr(PySocketSockObject *s)
return NULL;
}
#endif
PyOS_snprintf(
buf, sizeof(buf),
return PyUnicode_FromFormat(
"<socket object, fd=%ld, family=%d, type=%d, proto=%d>",
(long)s->sock_fd, s->sock_family,
s->sock_type,
s->sock_proto);
return PyUnicode_FromString(buf);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment