trust is stored in code_cell.metadata

not top-level code_cell

IPython/html/services/contents/tests/test_manager.py

@@ -311,13 +311,13 b' class TestContentsManager(TestCase):'
         cm.mark_trusted_cells(nb, name, path)
         for cell in nb.worksheets[0].cells:
             if cell.cell_type == 'code':
-                assert not cell.trusted
+                assert not cell.metadata.trusted
 
         cm.trust_notebook(name, path)
         nb = cm.get_model(name, path)['content']
         for cell in nb.worksheets[0].cells:
             if cell.cell_type == 'code':
-                assert cell.trusted
+                assert cell.metadata.trusted
 
     def test_check_and_sign(self):
         cm = self.contents_manager

IPython/html/static/notebook/js/codecell.js

@@ -472,7 +472,7 b' define(['
             } else {
                 this.set_input_prompt();
             }
-            this.output_area.trusted = data.trusted || false;
+            this.output_area.trusted = data.metadata.trusted || false;
             this.output_area.fromJSON(data.outputs);
             if (data.collapsed !== undefined) {
                 if (data.collapsed) {
@@ -495,8 +495,8 b' define(['
         var outputs = this.output_area.toJSON();
         data.outputs = outputs;
         data.language = 'python';
-        data.trusted = this.output_area.trusted;
-        data.collapsed = this.collapsed;
+        data.metadata.trusted = this.output_area.trusted;
+        data.collapsed = this.output_area.collapsed;
         return data;
     };
 

IPython/nbformat/sign.py

@@ -1,14 +1,7 b''
 """Functions for signing notebooks"""
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2014, The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
 import base64
 from contextlib import contextmanager
@@ -24,15 +17,14 b' from IPython.core.application import BaseIPythonApplication, base_flags'
 
 from .current import read, write
 
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
+
 try:
     # Python 3
     algorithms = hashlib.algorithms_guaranteed
 except AttributeError:
     algorithms = hashlib.algorithms
 
+
 def yield_everything(obj):
     """Yield every item in a container as bytes
     
@@ -184,7 +176,7 b' class NotebookNotary(LoggingConfigurable):'
     def mark_cells(self, nb, trusted):
         """Mark cells as trusted if the notebook's signature can be verified
         
-        Sets ``cell.trusted = True | False`` on all code cells,
+        Sets ``cell.metadata.trusted = True | False`` on all code cells,
         depending on whether the stored signature can be verified.
         
         This function is the inverse of check_cells
@@ -194,7 +186,7 b' class NotebookNotary(LoggingConfigurable):'
             return
         for cell in nb['worksheets'][0]['cells']:
             if cell['cell_type'] == 'code':
-                cell['trusted'] = trusted
+                cell['metadata']['trusted'] = trusted
     
     def _check_cell(self, cell):
         """Do we trust an individual cell?
@@ -208,7 +200,7 b' class NotebookNotary(LoggingConfigurable):'
         it will always be trusted.
         """
         # explicitly trusted
-        if cell.pop("trusted", False):
+        if cell['metadata'].pop("trusted", False):
             return True
         
         # explicitly safe output
@@ -243,6 +235,7 b' class NotebookNotary(LoggingConfigurable):'
             # only distrust a cell if it actually has some output to distrust
             if not self._check_cell(cell):
                 trusted = False
+
         return trusted
 
 

IPython/nbformat/tests/test_sign.py

@@ -83,21 +83,23 b' class TestNotary(TestsBase):'
         cells = self.nb.worksheets[0].cells
         self.notary.mark_cells(self.nb, False)
         for cell in cells:
+            self.assertNotIn('trusted', cell)
             if cell.cell_type == 'code':
-                self.assertIn('trusted', cell)
-                self.assertFalse(cell.trusted)
+                self.assertIn('trusted', cell.metadata)
+                self.assertFalse(cell.metadata.trusted)
             else:
-                self.assertNotIn('trusted', cell)
+                self.assertNotIn('trusted', cell.metadata)
     
     def test_mark_cells_trusted(self):
         cells = self.nb.worksheets[0].cells
         self.notary.mark_cells(self.nb, True)
         for cell in cells:
+            self.assertNotIn('trusted', cell)
             if cell.cell_type == 'code':
-                self.assertIn('trusted', cell)
-                self.assertTrue(cell.trusted)
+                self.assertIn('trusted', cell.metadata)
+                self.assertTrue(cell.metadata.trusted)
             else:
-                self.assertNotIn('trusted', cell)
+                self.assertNotIn('trusted', cell.metadata)
     
     def test_check_cells(self):
         nb = self.nb