summaryrefslogtreecommitdiff
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-04-20 01:19:55 -0700
committerLarry Hastings <larry@hastings.org>2015-04-20 01:19:55 -0700
commit1acdb95965928a103dc4222c245931daf7c3fedf (patch)
treee4ef3d4359a230dd59d0cbc448c5e1404e9da840 /Objects/unicodeobject.c
parent103e57a713d3d292924b9b89047f7c3ff8d2d28b (diff)
parent7e9d1d1a1b8ec4db9b9b6789b448c4202ab84b48 (diff)
downloadcpython-git-1acdb95965928a103dc4222c245931daf7c3fedf.tar.gz
Merge Python 3.5.0a4 release engineering commits.
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 9611ed41f7..3225fb3be9 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3607,21 +3607,6 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
int
-_PyUnicode_HasNULChars(PyObject* str)
-{
- Py_ssize_t pos;
-
- if (PyUnicode_READY(str) == -1)
- return -1;
- pos = findchar(PyUnicode_DATA(str), PyUnicode_KIND(str),
- PyUnicode_GET_LENGTH(str), '\0', 1);
- if (pos == -1)
- return 0;
- else
- return 1;
-}
-
-int
PyUnicode_FSConverter(PyObject* arg, void* addr)
{
PyObject *output = NULL;