[Python-checkins] cpython (merge 3.5 -> default): Backed out changeset da020e408c7f

[serhiy.storchaka]

https://hg.python.org/cpython/rev/0a749e651aa6
changeset:   100465:0a749e651aa6
parent:      100462:e045f26ea74a
parent:      100464:f48b32bc3d0a
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Mar 08 21:16:47 2016 +0200
summary:
  Backed out changeset da020e408c7f

files:
  Lib/test/test_os.py |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -836,11 +836,7 @@
         if support.can_symlink():
             os.symlink(os.path.abspath(t2_path), self.link_path)
             os.symlink('broken', broken_link_path, True)
-            if os.path.isdir(broken_link_path):
-                # On Windows a symlink can has the FILE_ATTRIBUTE_DIRECTORY flag.
-                self.sub2_tree = (sub2_path, ["broken_link", "link"], ["tmp3"])
-            else:
-                self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
+            self.sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
         else:
             self.sub2_tree = (sub2_path, [], ["tmp3"])
 

-- 
Repository URL: https://hg.python.org/cpython