Merge from 3.x: PR #4353

Author: ccordoba12

Diff for: MANIFEST.in

@@ -1,4 +1,4 @@
-recursive-include spyder *.pot *.po *.svg *.png *.css *.qss *.c, *.cpp, *.html, *.java, *.md, *.R, *.csv, *.pyx
+recursive-include spyder *.pot *.po *.svg *.png *.css *.qss *.c, *.cpp, *.html, *.java, *.md, *.R, *.csv, *.pyx, *.ipynb
 recursive-include spyder_breakpoints *.pot *.po *.svg *.png
 recursive-include spyder_profiler *.pot *.po *.svg *.png
 recursive-include spyder_pylint *.pot *.po *.svg *.png

Diff for: setup.py

@@ -218,7 +218,7 @@ def run(self):
 #==============================================================================
 EXTLIST = ['.mo', '.svg', '.png', '.css', '.html', '.js', '.chm', '.ini',
            '.txt', '.rst', '.qss', '.ttf', '.json', '.c', '.cpp', '.java',
-           '.md', '.R', '.csv', '.pyx']
+           '.md', '.R', '.csv', '.pyx', '.ipynb']
 if os.name == 'nt':
     SCRIPTS += ['spyder.bat']
     EXTLIST += ['.ico']

Diff for: spyder/app/tests/notebook.ipynb

@@ -0,0 +1,54 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "2"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "1 + 1"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.5.2+"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

Diff for: spyder/app/tests/test_mainwindow.py

@@ -10,10 +10,10 @@
 
 import os
 import os.path as osp
+import shutil
 import tempfile
 
 from flaky import flaky
-import nbformat
 import numpy as np
 from numpy.testing import assert_array_equal
 import pytest
@@ -147,8 +147,8 @@ def test_open_notebooks_from_project_explorer(main_window, qtbot):
     project_dir = tempfile.mkdtemp()
 
     # Create an empty notebook in the project dir
-    nb_contents = nbformat.v4.new_notebook()
-    nbformat.write(nb_contents, osp.join(project_dir, 'notebook.ipynb'))
+    nb = osp.join(LOCATION, 'notebook.ipynb')
+    shutil.copy(nb, osp.join(project_dir, 'notebook.ipynb'))
 
     # Create project
     with qtbot.waitSignal(projects.sig_project_loaded):
@@ -164,6 +164,19 @@ def test_open_notebooks_from_project_explorer(main_window, qtbot):
     # Assert that notebook was open
     assert 'notebook.ipynb' in editorstack.get_current_filename()
 
+    # Convert notebook to a Python file
+    projects.explorer.treewidget.convert_notebook(osp.join(project_dir, 'notebook.ipynb'))
+
+    # Assert notebook was open
+    assert 'untitled0.py' in editorstack.get_current_filename()
+
+    # Assert its contents are the expected ones
+    file_text = editorstack.get_current_editor().toPlainText()
+    assert file_text == '\n# coding: utf-8\n\n# In[1]:\n\n1 + 1\n\n\n# In[ ]:\n\n\n\n\n'
+
+    # Close last file (else tests hang here)
+    editorstack.close_file(force=True)
+
     # Close project
     projects.close_project()
 

Diff for: spyder/utils/tests/test_encoding.py

@@ -31,7 +31,7 @@ def test_is_text_file(tmpdir):
 def test_files_encodings(expected_encoding, text_file):
     with open(os.path.join(__location__, text_file), 'rb') as f:
         text = f.read()
-        assert get_coding(text) == expected_encoding
+        assert get_coding(text).lower() == expected_encoding.lower()
 
 
 if __name__ == '__main__':