summaryrefslogtreecommitdiffstats
path: root/Python/marshal.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-05-03 17:49:24 (GMT)
committerGuido van Rossum <guido@python.org>2007-05-03 17:49:24 (GMT)
commit8d30cc0144a6a94e06f3a115b07afa6314466cfd (patch)
tree0c0b2f3d75cca4173ec3e8e2962682affbd2e886 /Python/marshal.c
parent938ef57e267838dcfbfb0d51d9bd40caece1c5db (diff)
downloadcpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.zip
cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.gz
cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.bz2
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
Diffstat (limited to 'Python/marshal.c')
-rw-r--r--Python/marshal.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 2fb47e7..94d73a0 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -254,7 +254,6 @@ w_object(PyObject *v, WFILE *p)
w_long((long)n, p);
w_string(PyString_AS_STRING(v), (int)n, p);
}
-#ifdef Py_USING_UNICODE
else if (PyUnicode_Check(v)) {
PyObject *utf8;
utf8 = PyUnicode_AsUTF8String(v);
@@ -274,7 +273,6 @@ w_object(PyObject *v, WFILE *p)
w_string(PyString_AS_STRING(utf8), (int)n, p);
Py_DECREF(utf8);
}
-#endif
else if (PyTuple_Check(v)) {
w_byte(TYPE_TUPLE, p);
n = PyTuple_Size(v);
@@ -678,7 +676,6 @@ r_object(RFILE *p)
Py_INCREF(v);
return v;
-#ifdef Py_USING_UNICODE
case TYPE_UNICODE:
{
char *buffer;
@@ -701,7 +698,6 @@ r_object(RFILE *p)
PyMem_DEL(buffer);
return v;
}
-#endif
case TYPE_TUPLE:
n = r_long(p);