floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix linting

This commit is contained in:
Ronny Pfannschmidt 2018-09-19 09:07:02 +02:00
parent d053cdfbbb
commit 8e00280fc1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/_pytest/tmpdir.py
View File

@ -31,7 +31,6 @@ def _max(iterable, default):
def make_numbered_dir(root, prefix): def make_numbered_dir(root, prefix):
def parse_num(p, cut=len(prefix)): def parse_num(p, cut=len(prefix)):
maybe_num = p.name[cut:] maybe_num = p.name[cut:]
try: try:
@ -53,11 +52,13 @@ def make_numbered_dir(root, prefix):
else: else:
raise EnvironmentError( raise EnvironmentError(
"could not create numbered dir with prefix {prefix} in {root})".format( "could not create numbered dir with prefix {prefix} in {root})".format(
prefix=prefix, root=root)) prefix=prefix, root=root
)
)
def create_cleanup_lock(p): def create_cleanup_lock(p):
lock_path = p.joinpath('.lock') lock_path = p.joinpath(".lock")
fd = os.open(str(lock_path), os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o644) fd = os.open(str(lock_path), os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o644)
pid = os.getpid() pid = os.getpid()
spid = str(pid) spid = str(pid)
@ -82,6 +83,7 @@ def register_cleanup_lock_removal(lock_path):
lock_path.unlink() lock_path.unlink()
except (OSError, IOError): except (OSError, IOError):
pass pass
return atexit.register(cleanup_on_exit) return atexit.register(cleanup_on_exit)
@ -96,14 +98,12 @@ def make_numbered_dir_with_cleanup(root, prefix, keep, consider_lock_dead_after)
p = make_numbered_dir(root, prefix) p = make_numbered_dir(root, prefix)
lock_path = create_cleanup_lock(p) lock_path = create_cleanup_lock(p)
register_cleanup_lock_removal(lock_path) register_cleanup_lock_removal(lock_path)
except Exception as e: except Exception:
raise raise
else: else:
cleanup_numbered_dir(root=root, prefix=prefix, keep=keep) cleanup_numbered_dir(root=root, prefix=prefix, keep=keep)
return p return p
else:
raise e
@attr.s @attr.s
class TempPathFactory(object): class TempPathFactory(object):