Use emacs-recognised encoding declaration.

IPython/nbformat/v2/nbpy.py

@@ -24,7 +24,7 from .nbbase import new_code_cell, new_text_cell, new_worksheet, new_notebook
 # Code
 #-----------------------------------------------------------------------------
 
-_encoding_declaration_re = re.compile(r"^#\s*coding[:=]\s*([-\w.]+)")
+_encoding_declaration_re = re.compile(r"^#.*coding[:=]\s*([-\w.]+)")
 
 class PyReaderError(Exception):
     pass
@@ -113,7 +113,7 class PyReader(NotebookReader):
 class PyWriter(NotebookWriter):
 
     def writes(self, nb, **kwargs):
-        lines = [u'# coding: utf-8']
+        lines = [u'# -*- coding: utf-8 -*-']
         lines.extend([u'# <nbformat>2</nbformat>',''])
         for ws in nb.worksheets:
             for cell in ws.cells:

IPython/nbformat/v2/tests/nbexamples.py

@@ -81,7 +81,7 nb0 = new_notebook(
     metadata=md
 )
 
-nb0_py = """# coding: utf-8
+nb0_py = """# -*- coding: utf-8 -*-
 # <nbformat>2</nbformat>
 
 # <htmlcell>