@@ -458,7 +458,8 @@ def normpath(path):
458458 # in the case of paths with these prefixes:
459459 # \\.\ -> device names
460460 # \\?\ -> literal paths
461- # do not do any normalization, but return the path unchanged
461+ # do not do any normalization, but return the path
462+ # unchanged apart from the call to os.fspath()
462463 return path
463464 path = path .replace (altsep , sep )
464465 prefix , path = splitdrive (path )
@@ -575,7 +576,7 @@ def _getfinalpathname_nonstrict(path):
575576 return abspath (tail )
576577
577578 def realpath (path ):
578- path = os . fspath (path )
579+ path = normpath (path )
579580 if isinstance (path , bytes ):
580581 prefix = b'\\ \\ ?\\ '
581582 unc_prefix = b'\\ \\ ?\\ UNC\\ '
@@ -586,6 +587,7 @@ def realpath(path):
586587 unc_prefix = '\\ \\ ?\\ UNC\\ '
587588 new_unc_prefix = '\\ \\ '
588589 cwd = os .getcwd ()
590+ did_not_exist = not exists (path )
589591 had_prefix = path .startswith (prefix )
590592 path = _getfinalpathname_nonstrict (path )
591593 # The path returned by _getfinalpathname will always start with \\?\ -
@@ -603,7 +605,10 @@ def realpath(path):
603605 if _getfinalpathname (spath ) == path :
604606 path = spath
605607 except OSError as ex :
606- pass
608+ # If the path does not exist and originally did not exist, then
609+ # strip the prefix anyway.
610+ if ex .winerror in {2 , 3 } and did_not_exist :
611+ path = spath
607612 return path
608613
609614
0 commit comments