summaryrefslogtreecommitdiff
path: root/numpy/compat/py3k.py
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2009-12-06 12:10:42 +0000
committerPauli Virtanen <pav@iki.fi>2009-12-06 12:10:42 +0000
commita0ef94ef124d29c273ac7524f81458d118daf2c1 (patch)
treec33d59715926a10dea3ec7ce5c4834f0b8811506 /numpy/compat/py3k.py
parent906d21e1b3ef6e6cd68847c427c185137a151314 (diff)
downloadnumpy-a0ef94ef124d29c273ac7524f81458d118daf2c1.tar.gz
3K: rename compat.isfile to isfileobj to avoid confusion with os.path
Diffstat (limited to 'numpy/compat/py3k.py')
-rw-r--r--numpy/compat/py3k.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
index e99b29deb..64944dbfd 100644
--- a/numpy/compat/py3k.py
+++ b/numpy/compat/py3k.py
@@ -3,7 +3,7 @@ Python 3 compatibility tools.
"""
-__all__ = ['bytes', 'asbytes', 'isfile']
+__all__ = ['bytes', 'asbytes', 'isfileobj']
import sys
if sys.version_info[0] >= 3:
@@ -13,10 +13,10 @@ if sys.version_info[0] >= 3:
if isinstance(s, bytes):
return s
return s.encode('iso-8859-1')
- def isfile(f):
+ def isfileobj(f):
return isinstance(f, io.IOBase)
else:
bytes = str
asbytes = str
- def isfile(f):
+ def isfileobj(f):
return isinstance(f, file)