Skip to content

Commit 99d51c4

Browse files
committed
Move HTTPError remap up the stack
1 parent 78d21e6 commit 99d51c4

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

jupyter_server/services/contents/filemanager.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ def _default_preferred_dir(self):
7474
return os.path.relpath(value, self.root_dir).replace(os.path.sep, "/")
7575
return "/"
7676

77-
@validate("preferred_dir")
78-
def _validate_preferred_dir(self, proposal):
79-
try:
80-
return super()._validate_preferred_dir(proposal)
81-
except HTTPError as e:
82-
raise TraitError(e.log_message) from e
83-
8477
@default("checkpoints_class")
8578
def _checkpoints_class_default(self):
8679
return FileCheckpoints

jupyter_server/services/contents/manager.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ def emit(self, data):
8686
@validate("preferred_dir")
8787
def _validate_preferred_dir(self, proposal):
8888
value = proposal["value"]
89-
if not self.dir_exists(value):
89+
try:
90+
dir_exists = self.dir_exists(value)
91+
except HTTPError as e:
92+
raise TraitError(e.log_message) from e
93+
if not dir_exists:
9094
raise TraitError(_i18n("Preferred directory not found: %r") % value)
9195
return value
9296

0 commit comments

Comments
 (0)