summaryrefslogtreecommitdiffstats
path: root/Objects/memoryobject.c
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-10-15 15:53:58 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-10-15 15:53:58 (GMT)
commit08133af12e4dee7f688528075d96bb4df94dc0b0 (patch)
tree33a8bfac31ff596a7e876ea5c577800c1fc9c819 /Objects/memoryobject.c
parent196b0925ca55bf22ffbb97733cff3e63d4fb6e18 (diff)
downloadcpython-08133af12e4dee7f688528075d96bb4df94dc0b0.zip
cpython-08133af12e4dee7f688528075d96bb4df94dc0b0.tar.gz
cpython-08133af12e4dee7f688528075d96bb4df94dc0b0.tar.bz2
Issue #7142: Fix uses of unicode in memoryview objects
Diffstat (limited to 'Objects/memoryobject.c')
-rw-r--r--Objects/memoryobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 9427522..21e0645 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -335,7 +335,7 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)
static PyObject *
memory_format_get(PyMemoryViewObject *self)
{
- return PyUnicode_FromString(self->view.format);
+ return PyString_FromString(self->view.format);
}
static PyObject *
@@ -503,7 +503,7 @@ memory_dealloc(PyMemoryViewObject *self)
static PyObject *
memory_repr(PyMemoryViewObject *self)
{
- return PyUnicode_FromFormat("<memory at %p>", self);
+ return PyString_FromFormat("<memory at %p>", self);
}
/* Sequence methods */