diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Python/future.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.zip cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.bz2 | |
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
Diffstat (limited to 'Python/future.c')
| -rw-r--r-- | Python/future.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/future.c b/Python/future.c index ba058b8..2c6aaa2 100644 --- a/Python/future.c +++ b/Python/future.c @@ -20,7 +20,7 @@ future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename) names = s->v.ImportFrom.names; for (i = 0; i < asdl_seq_LEN(names); i++) { alias_ty name = (alias_ty)asdl_seq_GET(names, i); - const char *feature = PyBytes_AsString(name->name); + const char *feature = PyString_AsString(name->name); if (!feature) return 0; if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) { @@ -59,7 +59,7 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename) static PyObject *future; if (!future) { - future = PyBytes_InternFromString("__future__"); + future = PyString_InternFromString("__future__"); if (!future) return 0; } |