Author: Ronan Lamy <[email protected]>
Branch: stdlib-3.6.9
Changeset: r97060:eee05a6f019e
Date: 2019-08-04 20:12 +0100
http://bitbucket.org/pypy/pypy/changeset/eee05a6f019e/
Log: fix merge
diff --git a/lib-python/3/pathlib.py b/lib-python/3/pathlib.py
--- a/lib-python/3/pathlib.py
+++ b/lib-python/3/pathlib.py
@@ -330,7 +330,7 @@
target = accessor.readlink(newpath)
except OSError as e:
if e.errno != EINVAL and strict:
- raise
+ raise
# Not a symlink, or non-strict mode. We just leave the path
# untouched.
path = newpath
@@ -1244,18 +1244,18 @@
"""
if self._closed:
self._raise_closed()
- try:
- self._accessor.mkdir(self, mode)
+ try:
+ self._accessor.mkdir(self, mode)
except FileNotFoundError:
if not parents or self.parent == self:
- raise
+ raise
self.parent.mkdir(parents=True, exist_ok=True)
self.mkdir(mode, parents=False, exist_ok=exist_ok)
except OSError:
# Cannot rely on checking for EEXIST, since the operating system
# could give priority to other errors like EACCES or EROFS
- if not exist_ok or not self.is_dir():
- raise
+ if not exist_ok or not self.is_dir():
+ raise
def chmod(self, mode):
"""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
