diff options
| author | Brian Curtin <brian@python.org> | 2011-06-09 14:46:21 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2011-06-09 14:46:21 (GMT) |
| commit | d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff (patch) | |
| tree | 21c17b5c3a1b39ea3bf41110fb49f0e1332e6083 /Lib | |
| parent | 577a6af8e6b715e6b46e92cf14603a266fc361a8 (diff) | |
| parent | 95d028fd18fc33ceac8b2727a1e9fe3d4a8256b8 (diff) | |
| download | cpython-d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff.zip cpython-d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff.tar.gz cpython-d9463b233c5fefbda3f1b9f2b37f7ff78a7c88ff.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ntpath.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 2483ced..826be87 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -679,9 +679,7 @@ try: # attribute to tell whether or not the path is a directory. # This is overkill on Windows - just pass the path to GetFileAttributes # and check the attribute from there. - from nt import _isdir + from nt import _isdir as isdir except ImportError: - from genericpath import isdir as _isdir - -def isdir(path): - return _isdir(path) + # Use genericpath.isdir as imported above. + pass |