Merge pull request #3090 from mroutis/py3-system

py3: use links from os module
iterative · Jan 11, 2020 · 0110358 · 0110358
2 parents 84ec0d4 + df97a2a
commit 0110358
Showing 1 changed file with 9 additions and 45 deletions.
diff --git a/dvc/system.py b/dvc/system.py
@@ -4,6 +4,7 @@
 import shutil
 
 from dvc.compat import fspath
+from dvc.exceptions import DvcException
 
 
 logger = logging.getLogger(__name__)
@@ -21,55 +22,19 @@ def copy(src, dest):
 
     @staticmethod
     def hardlink(source, link_name):
-        import ctypes
-        from dvc.exceptions import DvcException
-
         source, link_name = fspath(source), fspath(link_name)
-
-        if System.is_unix():
-            try:
-                os.link(source, link_name)
-                return
-            except Exception as exc:
-                raise DvcException("link") from exc
-
-        CreateHardLink = ctypes.windll.kernel32.CreateHardLinkW
-        CreateHardLink.argtypes = [
-            ctypes.c_wchar_p,
-            ctypes.c_wchar_p,
-            ctypes.c_void_p,
-        ]
-        CreateHardLink.restype = ctypes.wintypes.BOOL
-
-        res = CreateHardLink(link_name, source, None)
-        if res == 0:
-            raise DvcException("CreateHardLinkW") from ctypes.WinError()
+        try:
+            os.link(source, link_name)
+        except OSError as exc:
+            raise DvcException("failed to link") from exc
 
     @staticmethod
     def symlink(source, link_name):
-        import ctypes
-        from dvc.exceptions import DvcException
-
         source, link_name = fspath(source), fspath(link_name)
-
-        if System.is_unix():
-            try:
-                os.symlink(source, link_name)
-                return
-            except Exception as exc:
-                msg = "failed to symlink '{}' -> '{}': {}"
-                raise DvcException(msg.format(source, link_name, str(exc)))
-
-        flags = 0
-        if source is not None and os.path.isdir(source):
-            flags = 1
-
-        func = ctypes.windll.kernel32.CreateSymbolicLinkW
-        func.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
-        func.restype = ctypes.c_ubyte
-
-        if func(link_name, source, flags) == 0:
-            raise DvcException("CreateSymbolicLinkW") from ctypes.WinError()
+        try:
+            os.symlink(source, link_name)
+        except OSError as exc:
+            raise DvcException("failed to symlink") from exc
 
     @staticmethod
     def _reflink_darwin(src, dst):
@@ -126,7 +91,6 @@ def _reflink_linux(src, dst):
     @staticmethod
     def reflink(source, link_name):
         import platform
-        from dvc.exceptions import DvcException
 
         source, link_name = fspath(source), fspath(link_name)