Fix project search if a directory is called manage.py, fixes #1314

This commit is contained in:
Dave Halter
2019-06-22 14:04:32 +02:00
parent aa2dc6be09
commit 3ae4a154f9
2 changed files with 7 additions and 2 deletions

View File

@@ -365,6 +365,11 @@ try:
except NameError:
NotADirectoryError = IOError
try:
IsADirectoryError = IsADirectoryError
except NameError:
IsADirectoryError = IOError
try:
PermissionError = PermissionError
except NameError:

View File

@@ -153,7 +153,7 @@ def _is_django_path(directory):
try:
with open(os.path.join(directory, 'manage.py'), 'rb') as f:
return b"DJANGO_SETTINGS_MODULE" in f.read()
except (FileNotFoundError, NotADirectoryError, PermissionError):
except (FileNotFoundError, IsADirectoryError, PermissionError):
return False
return False
@@ -169,7 +169,7 @@ def get_default_project(path=None):
for dir in traverse_parents(check, include_current=True):
try:
return Project.load(dir)
except (FileNotFoundError, NotADirectoryError, PermissionError):
except (FileNotFoundError, IsADirectoryError, PermissionError):
pass
if first_no_init_file is None: