summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-12-15 05:25:09 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2005-12-15 05:25:09 (GMT)
commita716eabca79f5da1605d758654b74798b90931d9 (patch)
treecb333c9e506fc6bef075058ff5b848d6b4677168 /Objects
parentb1975436808898d7588a00adec33524bb561089f (diff)
downloadcpython-a716eabca79f5da1605d758654b74798b90931d9.zip
cpython-a716eabca79f5da1605d758654b74798b90931d9.tar.gz
cpython-a716eabca79f5da1605d758654b74798b90931d9.tar.bz2
Revert r41662 and the part of 41552 that originally caused the problem
(calling ftell(stdin) doesn't seem defined). So we won't test errors from ftell unless we can do it portably.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/fileobject.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 1de520b..259a423 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -482,13 +482,6 @@ _portable_fseek(FILE *fp, Py_off_t offset, int whence)
static Py_off_t
_portable_ftell(FILE* fp)
{
-#ifdef HAVE_BROKEN_FTELL
- /* ftell doesn't fail for tty fds on FreeBSD and some others */
- if (isatty(fileno(fp))) {
- errno = ESPIPE;
- return -1;
- }
-#endif
#if !defined(HAVE_LARGEFILE_SUPPORT)
return ftell(fp);
#elif defined(HAVE_FTELLO) && SIZEOF_OFF_T >= 8