replacing os.path with pathlib
This commit is contained in:
parent
9ddbc964d4
commit
ff76871f4e
15
setup.py
15
setup.py
|
|
@ -9,9 +9,8 @@
|
|||
import re
|
||||
import ast
|
||||
import os
|
||||
import os.path
|
||||
import sys
|
||||
|
||||
from pathlib import Path
|
||||
# Add repo root to path so we can import scripts. Prior to PEP517 support this
|
||||
# was the default behavior for setuptools.
|
||||
# https://github.com/pypa/setuptools/issues/3939#issuecomment-1573619382
|
||||
|
|
@ -25,7 +24,7 @@ import setuptools
|
|||
|
||||
|
||||
try:
|
||||
BASEDIR = os.path.dirname(os.path.realpath(__file__))
|
||||
BASEDIR = Path(__file__).resolve().parent
|
||||
except NameError:
|
||||
BASEDIR = None
|
||||
|
||||
|
|
@ -50,8 +49,8 @@ def _get_constant(name):
|
|||
The value of the argument.
|
||||
"""
|
||||
field_re = re.compile(r'__{}__\s+=\s+(.*)'.format(re.escape(name)))
|
||||
path = os.path.join(BASEDIR, 'qutebrowser', '__init__.py')
|
||||
line = field_re.search(read_file(path)).group(1)
|
||||
init_path = BASEDIR / 'qutebrowser' / '__init__.py'
|
||||
line = field_re.search(read_file(init_path)).group(1)
|
||||
value = ast.literal_eval(line)
|
||||
return value
|
||||
|
||||
|
|
@ -99,6 +98,6 @@ try:
|
|||
)
|
||||
finally:
|
||||
if BASEDIR is not None:
|
||||
path = os.path.join(BASEDIR, 'qutebrowser', 'git-commit-id')
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
git_commit_id_path = BASEDIR / 'qutebrowser' / 'git-commit-id'
|
||||
if git_commit_id_path.exists():
|
||||
git_commit_id_path.unlink()
|
||||
|
|
|
|||
Loading…
Reference in New Issue