break(oserr): unexport pathsAsOne, new tryOsOp accepts 2 or 0 paths

Author: litlighilit

src/pylib/Lib/os_impl/path.nim

@@ -64,7 +64,7 @@ proc getsize*[T](filename: PathLike[T]): int =
   int statAttr(filename, st_size)
 
 func samefile*(a, b: PathLike): bool =
-  tryOsOp(pathsAsOne(a, b)): result = samefile(a.fspath, b.fspath)
+  tryOsOp(a, b): result = samefile(a.fspath, b.fspath)
 
 template split2Via(p, fn) =
   let t = fn $p

src/pylib/Lib/os_impl/posix_like/links.nim

@@ -317,5 +317,5 @@ else:
       raiseExcWithPath2(src, dst)
 
   proc link*[T](src, dst: PathLike[T]) =
-    pathsAsOne(src, dst).tryOsOp:
+    tryOsOp(src, dst):
       createHardlink($src, $dst)

src/pylib/Lib/shutil.nim

@@ -89,11 +89,10 @@ template copyGen(pyname, impl) =
     let
       ssrc = $src
       sdst = $dst
-      pth = pathsAsOne(src, dst)
       cpOptions = if follow_symlinks: {cfSymlinkFollow} else: {cfSymlinkAsIs}
     if sameFile(ssrc, sdst):
       raise newException(SameFileError, pth)
-    pth.tryOsOp: impl(ssrc, sdst, options=cpOptions)
+    tryOsOp(src, dst): impl(ssrc, sdst, options=cpOptions)
 
 copyGen copyfile, copyFileImpl
 

src/pylib/pyerrors/oserr.nim

@@ -155,20 +155,41 @@ proc raiseExcWithPath*(p: PathLike){.sideEffect.} =
   let oserr = osLastError()
   p.raiseExcWithPath(oserr)
 
-func pathsAsOne*[T](a, b: PathLike[T], sep = " -> "): string =
+func pathsAsOne[T](a, b: PathLike[T], sep = " -> "): string =
   ## used when there are two pathes that needs to be reported in error message.
   ## called by `raiseExcWithPath2`_
   a.pathrepr & sep & b.pathrepr
 
 proc raiseExcWithPath2*(src, dst: PathLike) =
   pathsAsOne(src, dst).raiseExcWithPath()
 
-template tryOsOp*(p: PathLike, body) =
+template tryOsOpAux(body, excHandleBody){.dirty.} =
   bind raiseExcWithPath
   try: body
   except OSError as e:
+    excHandleBody
+
+template tryOsOp*(p: PathLike, body) =
+  bind tryOsOpAux
+  tryOsOpAux(body):
     p.raiseExcWithPath(e.errorCode.OSErrorCode)
 
+template tryOsOp*(p: PathLike, raiseCond: bool, body) =
+  bind raiseExcWithPath
+  tryOsOpAux(body):
+    if raiseCond:
+      p.raiseExcWithPath(e.errorCode.OSErrorCode)
+
+template tryOsOp*(raiseCond: bool, body) =
+  bind raiseExcWithPath
+  tryOsOpAux(body):
+    if raiseCond:
+      raise newPyOSError(e.errorCode.cint, e.msg)
+
+template tryOsOp*(p1, p2: PathLike, body) =
+  bind pathsAsOne
+  pathsAsOne(p1, p2).tryOsOp body
+
 when InJs:
   proc errnoMsgOSErr(errnoCode: OSErrorCode): string = jsErrnoMsg(errnoCode)
   proc errnoMsg*(errno: cint): string = jsErrnoMsg(errno.OSErrorCode)