From: Walter Dörwald <walter@livinglogic.de>
Date: Thu, 24 May 2007 19:51:02 +0000 (+0000)
Subject: Simplify %U handling by using Py_UNICODE_COPY.
X-Git-Tag: v3.0a1~869
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c2fab6e23f8254a4af2f2e34c41aae2c14fced0;p=python

Simplify %U handling by using Py_UNICODE_COPY.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2fec095f1f..999b1661eb 100644
--- 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':