diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 21:05:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 21:05:53 (GMT) |
| commit | 38c36f857600c72a094c65010d51342a1fd73658 (patch) | |
| tree | e85caabd68ef137e309f9365019a9eb40eca88ff /Modules/zipimport.c | |
| parent | 19495a7adc505581734058a74c1a3476267bab40 (diff) | |
| download | cpython-38c36f857600c72a094c65010d51342a1fd73658.zip cpython-38c36f857600c72a094c65010d51342a1fd73658.tar.gz cpython-38c36f857600c72a094c65010d51342a1fd73658.tar.bz2 | |
Merged revisions 78875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r78875 | victor.stinner | 2010-03-12 18:00:41 +0100 (ven., 12 mars 2010) | 5 lines
Issue #6697: use %U format instead of _PyUnicode_AsString(), because
_PyUnicode_AsString() was not checked for error (NULL).
The unicode string is no more truncated to 200 or 400 *bytes*.
........
Diffstat (limited to 'Modules/zipimport.c')
| -rw-r--r-- | Modules/zipimport.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 770f18f..fed3e99 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -321,15 +321,12 @@ zipimporter_load_module(PyObject *obj, PyObject *args) /* add __path__ to the module *before* the code gets executed */ PyObject *pkgpath, *fullpath; - char *prefix = _PyUnicode_AsString(self->prefix); char *subname = get_subname(fullname); int err; - fullpath = PyUnicode_FromFormat("%s%c%s%s", - _PyUnicode_AsString(self->archive), - SEP, - prefix ? prefix : "", - subname); + fullpath = PyUnicode_FromFormat("%U%c%U%s", + self->archive, SEP, + self->prefix, subname); if (fullpath == NULL) goto error; |