xiaolanpython
diff --git a/‎Lib/test/test_memoryview.py‎
Lines changed: 7 additions & 0 deletions b/‎Lib/test/test_memoryview.py‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎Objects/memoryobject.c‎
Lines changed: 2 additions & 2 deletions b/‎Objects/memoryobject.c‎
Lines changed: 2 additions & 2 deletions
@@ -54,6 +54,12 @@ def test_iter(self):
             m = self._view(b)
             self.assertEqual(list(m), [m[i] for i in range(len(m))])
 
+    def test_repr(self):
+        for tp in self._types:
+            b = tp(self._source)
+            m = self._view(b)
+            self.assertIsInstance(m.__repr__(), str)
+
     def test_setitem_readonly(self):
         if not self.ro_type:
             return
@@ -156,6 +162,7 @@ def test_compare(self):
     def check_attributes_with_type(self, tp):
         m = self._view(tp(self._source))
         self.assertEquals(m.format, self.format)
+        self.assertIsInstance(m.format, str)
         self.assertEquals(m.itemsize, self.itemsize)
         self.assertEquals(m.ndim, 1)
         self.assertEquals(m.shape, (6,))
 
@@ -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 */
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char fort)`
`335`	`335`	`static PyObject *`
`336`	`336`	`memory_format_get(PyMemoryViewObject *self)`
`337`	`337`	`{`
`338`		`- return PyUnicode_FromString(self->view.format);`
	`338`	`+ return PyString_FromString(self->view.format);`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`static PyObject *`
`@@ -503,7 +503,7 @@ memory_dealloc(PyMemoryViewObject *self)`
`503`	`503`	`static PyObject *`
`504`	`504`	`memory_repr(PyMemoryViewObject *self)`
`505`	`505`	`{`
`506`		`- return PyUnicode_FromFormat("<memory at %p>", self);`
	`506`	`+ return PyString_FromFormat("<memory at %p>", self);`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`/* Sequence methods */`