Skip to content

Commit 760c90e

Browse files
committed
Some fixes to preferred_dir default handling
1 parent da33678 commit 760c90e

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

jupyter_server/services/contents/filemanager.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,8 @@ def _default_preferred_dir(self):
7070
DeprecationWarning,
7171
stacklevel=3,
7272
)
73-
# For transitioning to relative path, we check if it is a valid relative path:
74-
try:
75-
if not os.path.isabs(value) and self.dir_exists(value):
76-
return value
77-
except HTTPError:
78-
pass
79-
value = self.parent._normalize_dir(value)
8073
if not os.path.isdir(value):
81-
raise TraitError(_i18n("No such directory: %r") % value)
74+
raise TraitError(_i18n("No such preferred dir: %r") % value)
8275
if not (value + os.path.sep).startswith(self.root_dir):
8376
raise TraitError("%s is outside root contents directory" % value)
8477
return os.path.relpath(value, self.root_dir).replace(os.path.sep, "/")
@@ -87,7 +80,7 @@ def _default_preferred_dir(self):
8780
@validate("preferred_dir")
8881
def _validate_preferred_dir(self, proposal):
8982
try:
90-
super()._validate_preferred_dir(proposal)
83+
return super()._validate_preferred_dir(proposal)
9184
except HTTPError as e:
9285
raise TraitError(e.log_message) from e
9386

0 commit comments

Comments
 (0)