Author: Carl Friedrich Bolz-Tereick <cfb...@gmx.de>
Branch: py3.6
Changeset: r98434:1a321e4e7973
Date: 2020-01-01 16:53 +0100
http://bitbucket.org/pypy/pypy/changeset/1a321e4e7973/
Log: merge heads
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1740,16 +1740,6 @@
def utf8_w(self, w_obj):
return w_obj.utf8_w(self)
- def utf8_0_w(self, w_obj):
- "Like utf_w, but rejects strings with NUL bytes."
- from rpython.rlib import rstring
- result = w_obj.utf8_w(self)
- if '\x00' in result:
- raise oefmt(self.w_TypeError,
- "argument must be a string without NUL "
- "characters")
- return rstring.assert_str0(result)
-
def convert_to_w_unicode(self, w_obj):
return w_obj.convert_to_w_unicode(self)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
