Simplify %U handling by using Py_UNICODE_COPY.

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2fec095f1f46b1c0a82910a83e20d6cff20b199c..999b1661eb26c4ea9777c9ab5fab6b4c65c54402 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -690,11 +690,9 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
                        case 'U':
                        {
                                PyObject *obj = va_arg(vargs, PyObject *);
-                               Py_UNICODE *ucopy = PyUnicode_AS_UNICODE(obj);
-                               Py_ssize_t usize = PyUnicode_GET_SIZE(obj);
-                               Py_ssize_t upos;
-                               for (upos = 0; upos<usize;)
-                                       *s++ = ucopy[upos++];
+                               Py_ssize_t size = PyUnicode_GET_SIZE(obj);
+                               Py_UNICODE_COPY(s, PyUnicode_AS_UNICODE(obj), size);
+                               s += size;
                                break;
                        }
                        case 'S':