Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Simplify socket_repr() by using PyUnicode_FromFormat() 

directly. Add a test that calls socket_repr().
This commit is contained in:
Walter Dörwald 2007-06-05 13:41:53 +00:00
parent 787b03ba4b
commit a7eb93ec43
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_socket.py
View File

@ -217,6 +217,10 @@ class SocketPairTest(unittest.TestCase, ThreadableTest):
class GeneralModuleTests(unittest.TestCase): 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): def test_weakref(self):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
p = proxy(s) p = proxy(s)

4
Modules/socketmodule.c
View File

@ -2787,13 +2787,11 @@ sock_repr(PySocketSockObject *s)
return NULL; return NULL;
} }
#endif #endif
PyOS_snprintf( return PyUnicode_FromFormat(
buf, sizeof(buf),
"<socket object, fd=%ld, family=%d, type=%d, proto=%d>", "<socket object, fd=%ld, family=%d, type=%d, proto=%d>",
(long)s->sock_fd, s->sock_family, (long)s->sock_fd, s->sock_family,
s->sock_type, s->sock_type,
s->sock_proto); s->sock_proto);
return PyUnicode_FromString(buf);
} }