mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Get rid of all #ifdef Py_USING_UNICODE (it is always present now).

Browse source 
(With the help of unifdef from freshmeat.)
This commit is contained in:
Guido van Rossum 2007-05-03 17:49:24 +00:00
parent 938ef57e26
commit 8d30cc0144
36 changed files with 10 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/posixmodule.c
View file

@ -44,10 +44,6 @@ standardized by the C Standard and the POSIX standard (a thinly\n\
disguised Unix interface). Refer to the library manual and\n\
corresponding Unix manual entries for more information on calls.");
#ifndef Py_USING_UNICODE
/* This is used in signatures of functions. */
#define Py_UNICODE void
#endif
#if defined(PYOS_OS2)
#define INCL_DOS
@ -1895,7 +1891,6 @@ posix_getcwd(PyObject *self, PyObject *noargs)
return PyString_FromString(buf);
}
#ifdef Py_USING_UNICODE
PyDoc_STRVAR(posix_getcwdu__doc__,
"getcwdu() -> path\n\n\
Return a unicode string representing the current working directory.");
@ -1949,7 +1944,6 @@ posix_getcwdu(PyObject *self, PyObject *noargs)
return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"strict");
}
#endif
#endif
#ifdef HAVE_LINK
@ -2242,7 +2236,6 @@ posix_listdir(PyObject *self, PyObject *args)
d = NULL;
break;
}
#ifdef Py_USING_UNICODE
if (arg_is_unicode) {
PyObject *w;
@ -2259,7 +2252,6 @@ posix_listdir(PyObject *self, PyObject *args)
PyErr_Clear();
}
}
#endif
if (PyList_Append(d, v) != 0) {
Py_DECREF(v);
Py_DECREF(d);
@ -5764,14 +5756,11 @@ posix_readlink(PyObject *self, PyObject *args)
char buf[MAXPATHLEN];
char *path;
int n;
#ifdef Py_USING_UNICODE
int arg_is_unicode = 0;
#endif
if (!PyArg_ParseTuple(args, "et:readlink",
Py_FileSystemDefaultEncoding, &path))
return NULL;
#ifdef Py_USING_UNICODE
v = PySequence_GetItem(args, 0);
if (v == NULL) return NULL;
@ -5779,7 +5768,6 @@ posix_readlink(PyObject *self, PyObject *args)
arg_is_unicode = 1;
}
Py_DECREF(v);
#endif
Py_BEGIN_ALLOW_THREADS
n = readlink(path, buf, (int) sizeof buf);
@ -5788,7 +5776,6 @@ posix_readlink(PyObject *self, PyObject *args)
return posix_error_with_filename(path);
v = PyString_FromStringAndSize(buf, n);
#ifdef Py_USING_UNICODE
if (arg_is_unicode) {
PyObject *w;
@ -5805,7 +5792,6 @@ posix_readlink(PyObject *self, PyObject *args)
PyErr_Clear();
}
}
#endif
return v;
}
#endif /* HAVE_READLINK */
@ -8184,10 +8170,8 @@ static PyMethodDef posix_methods[] = {
#endif
#ifdef HAVE_GETCWD
{"getcwd", posix_getcwd, METH_NOARGS, posix_getcwd__doc__},
#ifdef Py_USING_UNICODE
{"getcwdu", posix_getcwdu, METH_NOARGS, posix_getcwdu__doc__},
#endif
#endif
#ifdef HAVE_LINK
{"link", posix_link, METH_VARARGS, posix_link__doc__},
#endif /* HAVE_LINK */