1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor to avoid ultra-deeply-nested code.

Browse Source
This commit is contained in:
Guido van Rossum 2007-05-23 21:36:49 +00:00
parent e3d1d41184
commit d8595fe304
1 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Modules/datetimemodule.c
View File

@ -1130,6 +1130,54 @@ format_utcoffset(char *buf, size_t buflen, const char *sep,
return 0; return 0;
} }
static PyObject *
make_Zreplacement(PyObject *object, PyObject *tzinfoarg)
{
PyObject *tzinfo = get_tzinfo_member(object);
PyObject *Zreplacement = PyString_FromString("");
if (Zreplacement == NULL)
return NULL;
if (tzinfo != Py_None && tzinfo != NULL) {
PyObject *temp;
assert(tzinfoarg != NULL);
temp = call_tzname(tzinfo, tzinfoarg);
if (temp == NULL)
goto Error;
if (temp != Py_None) {
assert(PyUnicode_Check(temp));
/* Since the tzname is getting stuffed into the
* format, we have to double any % signs so that
* strftime doesn't treat them as format codes.
*/
Py_DECREF(Zreplacement);
Zreplacement = PyObject_CallMethod(temp, "replace",
"ss", "%", "%%");
Py_DECREF(temp);
if (Zreplacement == NULL)
return NULL;
if (PyUnicode_Check(Zreplacement)) {
Zreplacement =
_PyUnicode_AsDefaultEncodedString(
Zreplacement, NULL);
if (Zreplacement == NULL)
return NULL;
}
if (!PyString_Check(Zreplacement)) {
PyErr_SetString(PyExc_TypeError,
"tzname.replace() did not return a string");
goto Error;
}
}
else
Py_DECREF(temp);
}
return Zreplacement;
Error:
Py_DECREF(Zreplacement);
return NULL;
}
/* I sure don't want to reproduce the strftime code from the time module, /* I sure don't want to reproduce the strftime code from the time module,
* so this imports the module and calls it. All the hair is due to * so this imports the module and calls it. All the hair is due to
* giving special meanings to the %z and %Z format codes via a preprocessing * giving special meanings to the %z and %Z format codes via a preprocessing
@ -1240,44 +1288,13 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
else if (ch == 'Z') { else if (ch == 'Z') {
/* format tzname */ /* format tzname */
if (Zreplacement == NULL) { if (Zreplacement == NULL) {
PyObject *tzinfo = get_tzinfo_member(object); Zreplacement = make_Zreplacement(object,
Zreplacement = PyString_FromString(""); tzinfoarg);
if (Zreplacement == NULL) goto Done; if (Zreplacement == NULL)
if (tzinfo != Py_None && tzinfo != NULL) { goto Done;
PyObject *temp;
assert(tzinfoarg != NULL);
temp = call_tzname(tzinfo, tzinfoarg);
if (temp == NULL) goto Done;
if (temp != Py_None) {
assert(PyUnicode_Check(temp));
/* Since the tzname is getting
* stuffed into the format, we
* have to double any % signs
* so that strftime doesn't
* treat them as format codes.
*/
Py_DECREF(Zreplacement);
Zreplacement = PyObject_CallMethod(
temp, "replace",
"ss", "%", "%%");
Py_DECREF(temp);
if (Zreplacement == NULL)
goto Done;
if (PyUnicode_Check(Zreplacement)) {
Zreplacement = _PyUnicode_AsDefaultEncodedString(Zreplacement, NULL);
if (Zreplacement == NULL)
goto Done;
}
if (!PyString_Check(Zreplacement)) {
PyErr_SetString(PyExc_TypeError, "tzname.replace() did not return a string");
goto Done;
}
}
else
Py_DECREF(temp);
}
} }
assert(Zreplacement != NULL); assert(Zreplacement != NULL);
assert(PyString_Check(Zreplacement));
ptoappend = PyString_AS_STRING(Zreplacement); ptoappend = PyString_AS_STRING(Zreplacement);
ntoappend = PyString_GET_SIZE(Zreplacement); ntoappend = PyString_GET_SIZE(Zreplacement);
} }