Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.3
Changeset: r75248:bbfa38c0f158
Date: 2015-01-05 22:34 +0100
http://bitbucket.org/pypy/pypy/changeset/bbfa38c0f158/
Log: Port CPython issue18109, which has no test :-/
diff --git a/pypy/module/_socket/interp_func.py
b/pypy/module/_socket/interp_func.py
--- a/pypy/module/_socket/interp_func.py
+++ b/pypy/module/_socket/interp_func.py
@@ -19,7 +19,7 @@
res = rsocket.gethostname()
except SocketError, e:
raise converted_error(space, e)
- return space.wrap(res)
+ return space.fsdecode(space.wrapbytes(res))
@unwrap_spec(host=str)
def gethostbyname(space, host):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
