Show More
@@ -54,29 +54,21 b' class NotebookManager(LoggingConfigurable):' | |||
|
54 | 54 | Returns |
|
55 | 55 | ------- |
|
56 | 56 | name : string or None |
|
57 |
the filename of the notebook, or None if not a .ipynb exte |
|
|
58 |
path : string |
|
|
57 | the filename of the notebook, or None if not a .ipynb extension | |
|
58 | path : string | |
|
59 | 59 | the path to the directory which contains the notebook |
|
60 | 60 | """ |
|
61 | 61 | names = notebook_path.split('/') |
|
62 | if len(names) > 1: | |
|
63 |
|
|
|
64 |
|
|
|
65 |
|
|
|
66 |
|
|
|
67 | else: | |
|
68 | name = None | |
|
69 | path = notebook_path+'/' | |
|
62 | ||
|
63 | name = names[-1] | |
|
64 | if name.endswith(".ipynb"): | |
|
65 | name = name | |
|
66 | path = "/".join(names[:-1]) + '/' | |
|
70 | 67 | else: |
|
71 |
name = n |
|
|
72 | if name.endswith(".ipynb"): | |
|
73 | name = name | |
|
74 | path = None | |
|
75 | else: | |
|
76 | name = None | |
|
77 | path = notebook_path+'/' | |
|
68 | name = None | |
|
69 | path = "/".join(names) + '/' | |
|
78 | 70 | return name, path |
|
79 | ||
|
71 | ||
|
80 | 72 | def url_encode(self, path): |
|
81 | 73 | parts = path.split('/') |
|
82 | 74 | return os.path.join(*[quote(p) for p in parts]) |
@@ -40,10 +40,17 b' class TestNotebookManager(TestCase):' | |||
|
40 | 40 | name, path = nm.named_notebook_path('hello') |
|
41 | 41 | self.assertEqual(name, None) |
|
42 | 42 | self.assertEqual(path, 'hello/') |
|
43 | ||
|
44 | name, path = nm.named_notebook_path('/') | |
|
45 | self.assertEqual(name, None) | |
|
43 | 46 | |
|
44 | 47 | name, path = nm.named_notebook_path('hello.ipynb') |
|
45 | 48 | self.assertEqual(name, 'hello.ipynb') |
|
46 |
self.assertEqual(path, |
|
|
49 | self.assertEqual(path, '/') | |
|
50 | ||
|
51 | name, path = nm.named_notebook_path('/hello.ipynb') | |
|
52 | self.assertEqual(name, 'hello.ipynb') | |
|
53 | self.assertEqual(path, '/') | |
|
47 | 54 | |
|
48 | 55 | name, path = nm.named_notebook_path('/this/is/a/path/hello.ipynb') |
|
49 | 56 | self.assertEqual(name, 'hello.ipynb') |
General Comments 0
You need to be logged in to leave comments.
Login now