Merge remote-tracking branch 'origin/master' into 5798-json-logging

.travis.yml

@@ -24,7 +24,7 @@ before_install:
     - nvm use 6.9.2
     - node --version
     - npm --version
-    - npm upgrade -g npm
+    - npm install -g npm
     - npm install
     - |
       if [[ $GROUP == js* ]]; then

docs/source/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # Jupyter Notebook documentation build configuration file, created by
 # sphinx-quickstart on Mon Apr 13 09:51:11 2015.

docs/source/examples/Notebook/What is the Jupyter Notebook.ipynb

@@ -135,7 +135,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "When you run the notebook web application on your computer, notebook documents are just **files on your local filesystem with a `.ipynb` extension**. This allows you to use familiar workflows for organizing your notebooks into folders and sharing them with others."
+    "When you run the notebook web application on your computer, notebook documents are just **files on your local filesystem with a** `.ipynb` **extension**. This allows you to use familiar workflows for organizing your notebooks into folders and sharing them with others."
    ]
   },
   {
@@ -148,7 +148,7 @@
     "* **Markdown cells:** Narrative text with embedded LaTeX equations\n",
     "* **Raw cells:** Unformatted text that is included, without modification, when notebooks are converted to different formats using nbconvert\n",
     "\n",
-    "Internally, notebook documents are **[JSON](https://en.wikipedia.org/wiki/JSON) data** with **binary values [base64](https://en.wikipedia.org/wiki/Base64)** encoded. This allows them to be **read and manipulated programmatically** by any programming language. Because JSON is a text format, notebook documents are version control friendly.\n",
+    "Internally, notebook documents are [JSON](https://en.wikipedia.org/wiki/JSON) **data** with **binary values** [base64](https://en.wikipedia.org/wiki/Base64) encoded. This allows them to be **read and manipulated programmatically** by any programming language. Because JSON is a text format, notebook documents are version control friendly.\n",
     "\n",
     "**Notebooks can be exported** to different static formats including HTML, reStructeredText, LaTeX, PDF, and slide shows ([reveal.js](https://revealjs.com)) using Jupyter's `nbconvert` utility.\n",
     "\n",

notebook/__main__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 
 if __name__ == '__main__':
     from notebook import notebookapp as app

notebook/_sysinfo.py

@@ -1,4 +1,3 @@
-# encoding: utf-8
 """
 Utilities for getting information about Jupyter and the system it's running in.
 """
@@ -6,8 +5,6 @@ Utilities for getting information about Jupyter and the system it's running in.
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import
-
 import os
 import platform
 import pprint

notebook/_tz.py

@@ -1,4 +1,3 @@
-# encoding: utf-8
 """
 Timezone utilities
 

notebook/auth/tests/test_security.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 from ..security import passwd, passwd_check
 import nose.tools as nt
 

notebook/base/zmqhandlers.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Tornado handlers for WebSocket <-> ZMQ sockets."""
 
 # Copyright (c) Jupyter Development Team.

notebook/config_manager.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Manager to read and modify config data in JSON files."""
 
 # Copyright (c) Jupyter Development Team.

notebook/edit/handlers.py

@@ -1,4 +1,3 @@
-#encoding: utf-8
 """Tornado handlers for the terminal emulator."""
 
 # Copyright (c) Jupyter Development Team.

notebook/extensions.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Utilities for installing extensions"""
 
 # Copyright (c) Jupyter Development Team.

notebook/jstest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Notebook Javascript Test Controller
 
 This module runs one or more subprocesses which will actually run the Javascript
@@ -8,8 +7,6 @@ test suite.
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import, print_function
-
 import argparse
 import json
 import multiprocessing.pool

notebook/nbconvert/tests/test_nbconvert_handlers.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 import io
 import json
 import os

notebook/nbextensions.py

@@ -1,11 +1,8 @@
-# coding: utf-8
 """Utilities for installing Javascript extensions for the notebook"""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 import os
 import shutil
 import sys

notebook/notebookapp.py

@@ -1,11 +1,8 @@
-# coding: utf-8
 """A tornado based Jupyter notebook server."""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import, print_function
-
 import notebook
 import asyncio
 import binascii

notebook/serverextensions.py

@@ -1,11 +1,8 @@
-# coding: utf-8
 """Utilities for installing server extensions for the notebook"""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 import importlib
 import sys
 

notebook/services/config/tests/test_config_api.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test the config webservice API."""
 
 import json

notebook/services/contents/tests/test_contents_api.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test the contents webservice API."""
 
 from contextlib import contextmanager

notebook/services/contents/tests/test_fileio.py

@@ -1,4 +1,3 @@
-# encoding: utf-8
 """Tests for file IO"""
 
 # Copyright (c) Jupyter Development Team.

notebook/services/contents/tests/test_manager.py

@@ -1,6 +1,4 @@
-# coding: utf-8
 """Tests for the notebook manager."""
-from __future__ import print_function
 
 import os
 import sys

notebook/services/kernelspecs/tests/test_kernelspecs_api.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test the kernel specs webservice API."""
 
 import errno

notebook/terminal/handlers.py

@@ -1,4 +1,3 @@
-#encoding: utf-8
 """Tornado handlers for the terminal emulator."""
 
 # Copyright (c) Jupyter Development Team.

notebook/tests/launchnotebook.py

@@ -1,7 +1,5 @@
 """Base class for notebook tests."""
 
-from __future__ import print_function
-
 from binascii import hexlify
 from contextlib import contextmanager
 import errno

notebook/tests/notebook/output.js

@@ -44,7 +44,6 @@ casper.notebook_test(function () {
         IPython.notebook.insert_cell_at_index("code", 0);
         var cell = IPython.notebook.get_cell(0);
         cell.set_text([
-            "from __future__ import print_function",
             "import sys",
             "from IPython.display import display, clear_output"
             ].join("\n")

notebook/tests/test_files.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test the /files/ handler."""
 
 import io

notebook/tests/test_nbextensions.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test installation of notebook extensions"""
 
 # Copyright (c) Jupyter Development Team.

notebook/utils.py

@@ -3,8 +3,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 import asyncio
 import concurrent.futures
 import ctypes

notebook/view/handlers.py

@@ -1,4 +1,3 @@
-#encoding: utf-8
 """Tornado handlers for viewing HTML files."""
 
 # Copyright (c) Jupyter Development Team.

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """Setup script for Jupyter Notebook"""
 
 #-----------------------------------------------------------------------------

setupbase.py

@@ -1,4 +1,3 @@
-# encoding: utf-8
 """
 This module defines the things that are used in setup.py for building the notebook
 
@@ -11,8 +10,6 @@ This includes:
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 import os
 import re
 import pipes