Skip to content

Commit 010bfb7

Browse files
wingfishwingfish
authored
Merge pull request chinapnr#4 from chinapnr/v2019.1
V2019.1
2 parents d54dc40 + f59e473 commit 010bfb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+343
-4
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions

‎python_basic_notebook/basic demo.ipynb‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "code",
5+
"execution_count": 2,
6+
"metadata": {},
7+
"outputs": [
8+
{
9+
"name": "stdout",
10+
"output_type": "stream",
11+
"text": [
12+
"{'a': 1, 'b': 3, 'd': 4}\n"
13+
]
14+
}
15+
],
16+
"source": [
17+
"x = dict(a=1, b=2)\n",
18+
"y = dict(b=3, d=4)\n",
19+
"z = {**x, **y}\n",
20+
"print(z)"
21+
]
22+
},
23+
{
24+
"cell_type": "code",
25+
"execution_count": null,
26+
"metadata": {},
27+
"outputs": [],
28+
"source": []
29+
}
30+
],
31+
"metadata": {
32+
"kernelspec": {
33+
"display_name": "Python 3",
34+
"language": "python",
35+
"name": "python3"
36+
},
37+
"language_info": {
38+
"codemirror_mode": {
39+
"name": "ipython",
40+
"version": 3
41+
},
42+
"file_extension": ".py",
43+
"mimetype": "text/x-python",
44+
"name": "python",
45+
"nbconvert_exporter": "python",
46+
"pygments_lexer": "ipython3",
47+
"version": "3.7.1"
48+
}
49+
},
50+
"nbformat": 4,
51+
"nbformat_minor": 2
52+
}

python_basic/imgs/anaconda.png renamed to python_basic_notebook/imgs/anaconda.png

File renamed without changes.

python_basic/imgs/jupyter.png renamed to python_basic_notebook/imgs/jupyter.png

File renamed without changes.

python_basic/imgs/pycharm.png renamed to python_basic_notebook/imgs/pycharm.png

File renamed without changes.

python_basic/imgs/python_install.jpeg renamed to python_basic_notebook/imgs/python_install.jpeg

File renamed without changes.

python_basic/imgs/python_install_1.jpeg renamed to python_basic_notebook/imgs/python_install_1.jpeg

File renamed without changes.

python_basic/imgs/python_install_2.jpeg renamed to python_basic_notebook/imgs/python_install_2.jpeg

File renamed without changes.

python_basic/imgs/python_install_3.jpeg renamed to python_basic_notebook/imgs/python_install_3.jpeg

File renamed without changes.

python_basic/imgs/python_install_4.jpeg renamed to python_basic_notebook/imgs/python_install_4.jpeg

File renamed without changes.

0 commit comments

Comments
 (0)