Merge branch 'dev/python_list' into 'master'

dev(hansbug): update README.md && refactor tuple generation as iter generation

See merge request !1

README.md

@@ -5,7 +5,7 @@ Python 技能树开放编辑仓库
 ## 初始化
 
 ```
-pip install -r requirement.txt
+pip install -r requirements.txt
 ```
 
 ## 目录结构说明
@@ -262,13 +262,23 @@ int main(int argc, char** argv){
 
 输出 "Hello,World!" 字符串，找出错的那项。
 
+## template
+
+```python
+# this part is used to be displayed in jupyter notebook
+if ___name__ == '__main__':
+    str1 = "Hello,"
+    str2 = "World!"
+    print('str1' + 'str2')
+```
+
 ## 答案
 
 ```python
 if __name__ == '__main__':
     str1 = "Hello,"
     str2 = "World!"
-    print('str1'+'str2')
+    print('str1' + 'str2')
 ```
 
 ## 选项

data/1.python初阶/3.进阶语法/1.列表推导式/config.json

@@ -2,7 +2,7 @@
   "export": [
     "list01.json",
     "list02.json",
-    "tuple.json",
+    "iter.json",
     "dict.json"
   ],
   "keywords": [],

data/1.python初阶/3.进阶语法/1.列表推导式/iter.json

+{
+    "author": "HansBug",
+    "source": "iter.md",
+    "depends": [],
+    "exercise_id": 190,
+    "type": "code_options"
+}

data/1.python初阶/3.进阶语法/1.列表推导式/iter.md

+# Python 生成器推导式
+
+Python 独步天下的推导式表达式，使用元表推式过滤长度小于等于4的书籍
+
+```python
+def test():
+	books = ('程序员修炼之道', '构建之法', '代码大全', 'TCP/IP协议详解')
+
+	# TODO(you): 此处请为reading进行正确的赋值
+
+	print("太长的书就不看了，只读短的：")
+	for book in reading:
+		print(" ->《{}》".format(book))
+
+	print("可是发现书的名字短，内容也可能很长啊！")
+
+
+if __name__ == '__main__':
+	test()
+```
+
+请选出下列能**正确**实现这一功能的选项。
+
+
+
+## template
+
+```python
+def test():
+	books = ('程序员修炼之道', '构建之法', '代码大全', 'TCP/IP协议详解')
+
+	reading = (book for book in books if len(book) <= 4)
+
+	print("太长的书就不看了，只读短的：")
+	for book in reading:
+		print(" ->《{}》".format(book))
+
+	print("可是发现书的名字短，内容也可能很长啊！")
+
+
+if __name__ == '__main__':
+	test()
+```
+
+
+
+## 答案
+
+```python
+reading = (book for book in books if len(book) <= 4)
+```
+
+
+
+## 选项
+
+### A
+
+```python
+reading = (books[i] for book in books: if len(book) < 4)
+```
+
+### B
+
+```python
+reading = (book for book in books if len(book) < 4)
+```
+
+### C
+
+```python
+reading = (book for book in books: if len(book) <= 4)
+```
+
+
+
+
+
+
+

data/1.python初阶/3.进阶语法/1.列表推导式/tuple.json

-{
-  "one_line": {
-    "if len(book) <= 4": [
-      "if len(book) < 4"
-    ],
-    "for book in books": [
-      "for book in books:"
-    ],
-    "book for book": [
-      "books[i] for book"
-    ]
-  },
-  "source": "tuple.py",
-  "depends": [],
-  "exercise_id": 194,
-  "type": "code_options"
-}
\ No newline at end of file

data/1.python初阶/3.进阶语法/1.列表推导式/tuple.py

-# -*- coding: UTF-8 -*-
-# 作者：huanhuilong
-# 标题：Python 元组推导式
-# 描述：Python 独步天下的推导式表达式，使用元表推式过滤长度小于等于4的书籍
-
-
-def test():
-    books = ('程序员修炼之道', '构建之法', '代码大全', 'TCP/IP协议详解')
-
-    reading = (book for book in books if len(book) <= 4)
-
-    print("太长的书就不看了，只读短的：")
-    for book in reading:
-        print(" ->《{}》".format(book))
-
-    print("可是发现书的名字短，内容也可能很长啊！")
-
-
-if __name__ == '__main__':
-    test()