Merge
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 765e1bf..e121262 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -521,3 +521,15 @@
if not rel_list:
return curdir
return join(*rel_list)
+
+try:
+ # The genericpath.isdir implementation uses os.stat and checks the mode
+ # 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
+except ImportError:
+ from genericpath import isdir as _isdir
+
+def isdir(path):
+ return _isdir(path)