Merge branch 'master' into bugfix/skip_requirements-gh-2349

This commit is contained in:
Dan Ryan
2018-06-14 00:27:51 -04:00
committed by GitHub
+9 -1
View File
@@ -51,7 +51,15 @@ from .environments import (
def _normalized(p):
if p is None:
return None
return normalize_drive(str(Path(p).resolve()))
loc = Path(p)
if loc.is_absolute():
return normalize_drive(str(loc))
else:
try:
loc = loc.resolve()
except OSError:
loc = loc.absolute()
return normalize_drive(str(loc))
DEFAULT_NEWLINES = u'\n'