diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-26 03:56:04 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-26 03:56:04 (GMT) |
| commit | 7e95befeda7c2c11a47001e96e2eb61ff5fd9287 (patch) | |
| tree | 2ddaf124c627ea5c76bcc0e6fd86fd822b8b8755 | |
| parent | fe53713506b93692d0fe7c8b65efd0dc600854e1 (diff) | |
| download | cpython-7e95befeda7c2c11a47001e96e2eb61ff5fd9287.zip cpython-7e95befeda7c2c11a47001e96e2eb61ff5fd9287.tar.gz cpython-7e95befeda7c2c11a47001e96e2eb61ff5fd9287.tar.bz2 | |
Use unicode and stop supporting str8
| -rw-r--r-- | Lib/test/test_funcattrs.py | 4 | ||||
| -rw-r--r-- | Objects/funcobject.c | 20 |
2 files changed, 9 insertions, 15 deletions
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py index 59f4613..528ca18 100644 --- a/Lib/test/test_funcattrs.py +++ b/Lib/test/test_funcattrs.py @@ -258,8 +258,8 @@ def test_func_globals(): def test_func_name(): def f(): pass verify(f.__name__ == "f") - f.__name__ = str8("g") - verify(f.__name__ == str8("g")) + f.__name__ = "g" + verify(f.__name__ == "g") cantset(f, "__globals__", 1) cantset(f, "__name__", 1) # test that you can access func.__name__ in restricted mode diff --git a/Objects/funcobject.c b/Objects/funcobject.c index d0ceccb..808f4ea 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -29,7 +29,7 @@ PyFunction_New(PyObject *code, PyObject *globals) consts = ((PyCodeObject *)code)->co_consts; if (PyTuple_Size(consts) >= 1) { doc = PyTuple_GetItem(consts, 0); - if (!PyString_Check(doc) && !PyUnicode_Check(doc)) + if (!PyUnicode_Check(doc)) doc = Py_None; } else @@ -44,7 +44,7 @@ PyFunction_New(PyObject *code, PyObject *globals) Otherwise, use None. */ if (!__name__) { - __name__ = PyString_InternFromString("__name__"); + __name__ = PyUnicode_InternFromString("__name__"); if (!__name__) { Py_DECREF(op); return NULL; @@ -297,7 +297,7 @@ func_set_code(PyFunctionObject *op, PyObject *value) PyErr_Format(PyExc_ValueError, "%s() requires a code object with %zd free vars," " not %zd", - PyString_AsString(op->func_name), + PyUnicode_AsString(op->func_name), nclosure, nfree); return -1; } @@ -322,7 +322,7 @@ func_set_name(PyFunctionObject *op, PyObject *value) /* Not legal to del f.func_name or to set it to anything * other than a string object. */ - if (value == NULL || (!PyString_Check(value) && !PyUnicode_Check(value))) { + if (value == NULL || !PyUnicode_Check(value)) { PyErr_SetString(PyExc_TypeError, "__name__ must be set to a string object"); return -1; @@ -482,12 +482,7 @@ func_new(PyTypeObject* type, PyObject* args, PyObject* kw) &PyDict_Type, &globals, &name, &defaults, &closure)) return NULL; - if (PyUnicode_Check(name)) { - name = _PyUnicode_AsDefaultEncodedString(name, NULL); - if (name == NULL) - return NULL; - } - if (name != Py_None && !PyString_Check(name)) { + if (name != Py_None && !PyUnicode_Check(name)) { PyErr_SetString(PyExc_TypeError, "arg 3 (name) must be None or string"); return NULL; @@ -573,9 +568,8 @@ func_dealloc(PyFunctionObject *op) static PyObject* func_repr(PyFunctionObject *op) { - return PyUnicode_FromFormat("<function %s at %p>", - PyString_AsString(op->func_name), - op); + return PyUnicode_FromFormat("<function %U at %p>", + op->func_name, op); } static int |