Show More
@@ -7,8 +7,6 b' import os' | |||
|
7 | 7 | import shutil |
|
8 | 8 | from unicodedata import normalize |
|
9 | 9 | |
|
10 | from zmq.utils import jsonapi | |
|
11 | ||
|
12 | 10 | pjoin = os.path.join |
|
13 | 11 | |
|
14 | 12 | import requests |
@@ -67,7 +65,7 b' class NBAPI(object):' | |||
|
67 | 65 | return self._req('DELETE', url_path_join(path, name)) |
|
68 | 66 | |
|
69 | 67 | def rename(self, name, path, new_name): |
|
70 |
body = json |
|
|
68 | body = json.dumps({'name': new_name}) | |
|
71 | 69 | return self._req('PATCH', url_path_join(path, name), body) |
|
72 | 70 | |
|
73 | 71 | def get_checkpoints(self, name, path): |
@@ -186,14 +184,14 b' class APITest(NotebookTestBase):' | |||
|
186 | 184 | nb = new_notebook(name='Upload test') |
|
187 | 185 | nbmodel = {'content': nb} |
|
188 | 186 | resp = self.nb_api.upload_untitled(path=u'å b', |
|
189 |
body=json |
|
|
187 | body=json.dumps(nbmodel)) | |
|
190 | 188 | self._check_nb_created(resp, 'Untitled0.ipynb', u'å b') |
|
191 | 189 | |
|
192 | 190 | def test_upload(self): |
|
193 | 191 | nb = new_notebook(name=u'ignored') |
|
194 | 192 | nbmodel = {'content': nb} |
|
195 | 193 | resp = self.nb_api.upload(u'Upload tést.ipynb', path=u'å b', |
|
196 |
body=json |
|
|
194 | body=json.dumps(nbmodel)) | |
|
197 | 195 | self._check_nb_created(resp, u'Upload tést.ipynb', u'å b') |
|
198 | 196 | |
|
199 | 197 | def test_copy_untitled(self): |
@@ -226,14 +224,14 b' class APITest(NotebookTestBase):' | |||
|
226 | 224 | |
|
227 | 225 | def test_save(self): |
|
228 | 226 | resp = self.nb_api.read('a.ipynb', 'foo') |
|
229 |
nbcontent = json |
|
|
227 | nbcontent = json.loads(resp.text)['content'] | |
|
230 | 228 | nb = to_notebook_json(nbcontent) |
|
231 | 229 | ws = new_worksheet() |
|
232 | 230 | nb.worksheets = [ws] |
|
233 | 231 | ws.cells.append(new_heading_cell(u'Created by test ³')) |
|
234 | 232 | |
|
235 | 233 | nbmodel= {'name': 'a.ipynb', 'path':'foo', 'content': nb} |
|
236 |
resp = self.nb_api.save('a.ipynb', path='foo', body=json |
|
|
234 | resp = self.nb_api.save('a.ipynb', path='foo', body=json.dumps(nbmodel)) | |
|
237 | 235 | |
|
238 | 236 | nbfile = pjoin(self.notebook_dir.name, 'foo', 'a.ipynb') |
|
239 | 237 | with io.open(nbfile, 'r', encoding='utf-8') as f: |
@@ -247,7 +245,7 b' class APITest(NotebookTestBase):' | |||
|
247 | 245 | |
|
248 | 246 | # Save and rename |
|
249 | 247 | nbmodel= {'name': 'a2.ipynb', 'path':'foo/bar', 'content': nb} |
|
250 |
resp = self.nb_api.save('a.ipynb', path='foo', body=json |
|
|
248 | resp = self.nb_api.save('a.ipynb', path='foo', body=json.dumps(nbmodel)) | |
|
251 | 249 | saved = resp.json() |
|
252 | 250 | self.assertEqual(saved['name'], 'a2.ipynb') |
|
253 | 251 | self.assertEqual(saved['path'], 'foo/bar') |
@@ -265,7 +263,7 b' class APITest(NotebookTestBase):' | |||
|
265 | 263 | self.assertEqual(r.headers['Location'].split('/')[-1], cp1['id']) |
|
266 | 264 | |
|
267 | 265 | # Modify it |
|
268 |
nbcontent = json |
|
|
266 | nbcontent = json.loads(resp.text)['content'] | |
|
269 | 267 | nb = to_notebook_json(nbcontent) |
|
270 | 268 | ws = new_worksheet() |
|
271 | 269 | nb.worksheets = [ws] |
@@ -273,7 +271,7 b' class APITest(NotebookTestBase):' | |||
|
273 | 271 | ws.cells.append(hcell) |
|
274 | 272 | # Save |
|
275 | 273 | nbmodel= {'name': 'a.ipynb', 'path':'foo', 'content': nb} |
|
276 |
resp = self.nb_api.save('a.ipynb', path='foo', body=json |
|
|
274 | resp = self.nb_api.save('a.ipynb', path='foo', body=json.dumps(nbmodel)) | |
|
277 | 275 | |
|
278 | 276 | # List checkpoints |
|
279 | 277 | cps = self.nb_api.get_checkpoints('a.ipynb', 'foo').json() |
General Comments 0
You need to be logged in to leave comments.
Login now