Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
7eb124b
第一周大作业提交
leiyue Jan 4, 2016
fe411df
第一次作业
iamgxd01 Jan 5, 2016
91c69cb
exercise_1
MaiZhenchao Jan 5, 2016
dc76c53
1.2homework
MaiZhenchao Jan 5, 2016
dab8be0
Add
xjlin Jan 6, 2016
36f73ee
Merge remote-tracking branch 'mugglecoding/master' into litong
TongTong2015 Jan 6, 2016
e9642dd
大作业-litong
TongTong2015 Jan 6, 2016
892f387
Merge pull request #14 from litong1990/litong
mugglecoding Jan 6, 2016
96ffd4b
Merge pull request #12 from xjlin/linxingjian
mugglecoding Jan 6, 2016
32e49ff
Merge remote-tracking branch 'mugglecoding/master'
Mingwang1986 Jan 6, 2016
c52f732
Merge remote-tracking branch 'mugglecoding/master' into linxingjian
xjlin Jan 7, 2016
a70f036
1.1-huangxiaoming
smallming36 Jan 7, 2016
6ed3536
Create huyongsheng
huyongsheng Jan 7, 2016
764f387
1
kata-2077 Jan 7, 2016
d3b1905
zhaocong
wormzc Jan 7, 2016
fcea9cf
Merge pull request #1 from huyongsheng/huyongsheng
huyongsheng Jan 7, 2016
083daac
Delete huyongsheng
huyongsheng Jan 7, 2016
66004ef
exercise_1
huyongsheng Dec 23, 2015
d99cba9
第一周大作业
chi1st Jan 7, 2016
0ea0768
Delete 花名册
mugglecoding Jan 7, 2016
8e72c6b
Merge pull request #27 from chi1st/yuanchi
mugglecoding Jan 7, 2016
2b9ce82
Merge pull request #26 from huyongsheng/huyongsheng
mugglecoding Jan 7, 2016
f4f7965
Merge pull request #24 from wormzc/zhaocong
mugglecoding Jan 7, 2016
74f3e51
Merge pull request #20 from smallming36/huangxiaoming
mugglecoding Jan 7, 2016
c177034
Merge pull request #18 from MaiZhenchao/MaiZhenchao
mugglecoding Jan 7, 2016
00d98ba
maizhenchao
MaiZhenchao Jan 7, 2016
8dfeb52
第一次大作业提交0107
iamgxd01 Jan 7, 2016
5d44b3c
week1-jianghao
j-how Jan 7, 2016
fd51d74
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
you-shu Jan 8, 2016
13bc6e7
week1大作业
you-shu Jan 8, 2016
ec30f1d
1.1
you-shu Jan 8, 2016
1722d1d
Merge pull request #30 from iamgxd01/master
mugglecoding Jan 8, 2016
1aeb255
Merge pull request #31 from j-how/jianghao
mugglecoding Jan 8, 2016
0629041
Merge pull request #29 from MaiZhenchao/MaiZhenchao
mugglecoding Jan 8, 2016
1202ed5
Week01 Homework
Jan 8, 2016
3d613aa
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
yaobozhang Jan 8, 2016
705e96b
1.1
you-shu Jan 8, 2016
026f0b7
exercise_1
Prof-L Jan 8, 2016
cb0a87c
1.1-yuanlinfang
Linfang-Yuan Jan 8, 2016
84bb9a5
zhukai
kata-2077 Jan 8, 2016
f3354df
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
kata-2077 Jan 8, 2016
5283150
朱凯
kata-2077 Jan 8, 2016
3201e49
week1大作业提交
Mingwang1986 Jan 8, 2016
9ebd467
week1-zhaorui
Jan 8, 2016
7f77801
week1-sushun
Jan 8, 2016
e90b18f
1-yaobozhang
yaobozhang Jan 8, 2016
56f6e74
Revert "1-yaobozhang"
yaobozhang Jan 8, 2016
b7e2737
yaobozhang
yaobozhang Jan 8, 2016
222a79e
大作业-fuzeyu
mikeeyfu Jan 8, 2016
09c8430
Merge remote-tracking branch 'mugglecoding/master' into wangming
Mingwang1986 Jan 8, 2016
109679c
1.1 zhangweihua
kelaodo Jan 8, 2016
e89f25f
第一次大作业
Zhangtaonupt Jan 8, 2016
be3ab60
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
Zhangtaonupt Jan 8, 2016
c87e654
Merge remote-tracking branch 'refs/remotes/mugglecoding/master' into …
maboping Jan 8, 2016
de99644
week1大作业提交
pengtao556 Jan 8, 2016
9b14937
Create zhangzhexu
zhangzhexu Jan 8, 2016
de80c82
maboping
maboping Jan 8, 2016
e71df98
Merge pull request #46 from pengtao556/master
mugglecoding Jan 8, 2016
aa21260
Merge pull request #45 from maboping/maboping
mugglecoding Jan 8, 2016
545ab84
Merge pull request #44 from Zhangtaonupt/Zhangtao
mugglecoding Jan 8, 2016
a36e677
Merge pull request #43 from kelaodo/zhangweihua
mugglecoding Jan 8, 2016
75eecb3
Merge pull request #42 from mikeeyfu/fuzeyu
mugglecoding Jan 8, 2016
2317a9a
Merge pull request #41 from yaobozhang/yaobozhang
mugglecoding Jan 8, 2016
84fc74f
Merge pull request #40 from sushun1991/sushun
mugglecoding Jan 8, 2016
d69ee3a
Merge pull request #39 from zhao-rui/zhaorui
mugglecoding Jan 8, 2016
d545fa3
Merge pull request #38 from Mingwang1986/wangming
mugglecoding Jan 8, 2016
8d801f4
Merge pull request #37 from zhukai2015/zhukai
mugglecoding Jan 8, 2016
7cf4a07
Merge pull request #36 from Linfang-Yuan/yuanlinfang
mugglecoding Jan 8, 2016
3aff562
Merge pull request #35 from Arthurdu/master
mugglecoding Jan 8, 2016
5a30eab
Merge pull request #34 from gongminghui/patch-1
mugglecoding Jan 8, 2016
bb1f261
Merge pull request #8 from iamgxd01/gaoxiangdong
mugglecoding Jan 8, 2016
b1fb383
第一周大作业提交
yinwanmei Jan 8, 2016
6cb7a09
Merge pull request #48 from yinwanmei/yinwanmei
mugglecoding Jan 8, 2016
f92b2e2
Merge remote-tracking branch 'mugglecoding/master' into Miaozaiye
miaozaiye Jan 8, 2016
8ea24b4
week1大作业
miaozaiye Jan 8, 2016
cc027ce
Merge pull request #49 from miaozaiye/Miaozaiye
mugglecoding Jan 8, 2016
cced189
huangxiaoming
smallming36 Jan 8, 2016
3d3bb50
fuzeyu
mikeeyfu Jan 8, 2016
343d091
zhaocong
wormzc Jan 8, 2016
a760e9d
Revert "Create zhangzhexu"
zhangzhexu Jan 8, 2016
b210c97
zhangzhexu
zhangzhexu Jan 8, 2016
960cd88
Homework_week1
kelaodo Jan 8, 2016
61ff6bc
SkipTickets by 柴源
circlechai Jan 8, 2016
fb31184
Delete chaiyuan.py
circlechai Jan 8, 2016
1d184bf
Create chaiyuan.py
circlechai Jan 8, 2016
f9a29e4
Merge pull request #50 from smallming36/huangxiaoming
mugglecoding Jan 9, 2016
6e821b3
Merge pull request #51 from mikeeyfu/fuzeyu
mugglecoding Jan 9, 2016
af2e912
Merge pull request #52 from zhangzhexu/master
mugglecoding Jan 9, 2016
b7f720c
Merge pull request #54 from kelaodo/patch-1
mugglecoding Jan 9, 2016
41075b5
Merge pull request #55 from circlechai/patch-2
mugglecoding Jan 9, 2016
f3aae2a
Merge pull request #56 from circlechai/master
mugglecoding Jan 9, 2016
fd30e93
yangruiyou
yangruiyou85 Jan 9, 2016
ee5cbf7
Merge pull request #57 from yangruiyou85/patch-4
mugglecoding Jan 9, 2016
7f6a04d
作业
zhouj1nx1n Jan 9, 2016
34ddb95
Merge remote-tracking branch 'mugglecoding/master' into zhangruochen
Jan 9, 2016
93a82d7
week1-zhangruochen
Jan 9, 2016
d3e25be
Merge pull request #59 from zhangruochen/zhangruochen
mugglecoding Jan 9, 2016
a749bd8
Merge pull request #58 from zhouj1nx1n/patch-1
mugglecoding Jan 9, 2016
5a32399
大作业提交
Jan 9, 2016
83e8987
Merge branch 'mugglecoding/master' into liyan0321
Jan 9, 2016
6549110
week homework
QuantVela Jan 9, 2016
3cf3353
提交大作业
Kylinlin Jan 9, 2016
4cbc51d
liyan
Jan 9, 2016
dd20d70
Merge branch 'mugglecoding/master' into liyan0321
Jan 9, 2016
f6d5270
Delete liyan00.py
liyan0321 Jan 10, 2016
676d4d2
Delete liyan000.py
liyan0321 Jan 10, 2016
4a9baf6
合并分支
leiyue Jan 10, 2016
18b9036
Merge remote-tracking branch 'origin/master'
leiyue Jan 10, 2016
10a1f43
合并分支
leiyue Jan 10, 2016
f37904e
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 10, 2016
cd26592
Create zhangguifeng
zhangguifeng Jan 10, 2016
7204dc0
大作业提交
zhangguifeng Jan 10, 2016
822c876
Merge pull request #66 from zhangguifeng/zhangguifeng
mugglecoding Jan 10, 2016
c0a0088
week2
QuantVela Jan 11, 2016
a2c46d6
2.1 homework
miaozaiye Jan 12, 2016
f3b9463
Add Week02 File
Jan 12, 2016
028ffdb
Merge remote-tracking branch 'mugglecoding/master' into liangzishan
Jan 12, 2016
49b25e2
Change some file
Jan 12, 2016
ce1c0b9
week2
QuantVela Jan 12, 2016
5a56393
week2up
QuantVela Jan 12, 2016
2d47735
1.2answerupdate
QuantVela Jan 13, 2016
9b4c38a
Merge pull request #33 from gongminghui/gongminghui
mugglecoding Jan 13, 2016
9f03820
Merge pull request #32 from lzsdodo/liangzishan
mugglecoding Jan 13, 2016
7b7d671
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 13, 2016
815fbc6
2.1作业提交
leiyue Jan 13, 2016
f58b978
a
QuantVela Jan 13, 2016
2d08fa2
Merge pull request #62 from Kylinlin/linguanhao
mugglecoding Jan 13, 2016
c51679c
Merge pull request #67 from miaozaiye/Miaozaiye
mugglecoding Jan 13, 2016
f974b02
Merge pull request #65 from zhangguifeng/patch-2
mugglecoding Jan 13, 2016
b74b016
Merge pull request #64 from liyan0321/liyan0321
mugglecoding Jan 13, 2016
27c1c80
leiyue
QuantVela Jan 13, 2016
f7b852b
2.1someone
QuantVela Jan 13, 2016
919b435
Add
xjlin Jan 13, 2016
8e272c6
2.2作业提交
leiyue Jan 13, 2016
d0114ae
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 13, 2016
380ab8c
和 upstream 仓库保持队形
leiyue Jan 13, 2016
428390c
移动 2.2 作业的 README.md 方便大家了解
leiyue Jan 13, 2016
0114367
修改 README.md 排版,讨厌的 GFM
leiyue Jan 13, 2016
d36aec2
Merge pull request #68 from xjlin/linxingjian
mugglecoding Jan 13, 2016
7acee99
2.1-zhaocong
wormzc Jan 14, 2016
3c0e738
Merge pull request #70 from wormzc/zhaocong
mugglecoding Jan 14, 2016
c5151d9
修改1.3练习题crawl_list未使用的bug
zhenchaozhu Jan 14, 2016
2aaf252
加入商户入口
leiyue Jan 14, 2016
da0a235
Merge branch 'master' of github.com:mugglecoding/Plan-for-combating
leiyue Jan 14, 2016
54cc6a6
Merge remote-tracking branch 'refs/remotes/mugglecoding/master'
Jan 15, 2016
915a67d
week2
Jan 15, 2016
192ec01
Merge remote-tracking branch 'refs/remotes/origin/zhangxiaoxi'
Jan 15, 2016
20df837
2作业
Jan 15, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
67 changes: 67 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
### Example user template template
### Example user template

# IntelliJ project files
.idea
*.iml
out
gen### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

21 changes: 0 additions & 21 deletions 1.2练习题答案/crawl_1.2.py

This file was deleted.

20 changes: 20 additions & 0 deletions 2.1mongodb_课程案例源码/mongodbVID.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import pymongo

client = pymongo.MongoClient('localhost',27017)
walden = client['walden']
sheet_tab = walden['sheet_tab']

# path = '/Users/Hou/Desktop/walden.txt'
# with open(path,'r') as f:
# lines = f.readlines()
# for index,line in enumerate(lines):
# data = {
# 'index':index,
# 'line' :line,
# 'words':len(line.split())
# }
# sheet_tab.insert_one(data)

# $lt/$lte/$gt/$gte/$ne,依次等价于</<=/>/>=/!=。(l表示less g表示greater e表示equal n表示not )
for item in sheet_tab.find({'words':{'$lt':5}}):
print(item)
44 changes: 44 additions & 0 deletions 2.1练习作业提交/2.1homework.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
from bs4 import BeautifulSoup
import requests
import pymongo

client = pymongo.MongoClient('localhost',27017)

xiaozhu = client['xiaozhu'] #建造数据库
sheet_tab = xiaozhu['sheet_tab'] #建造库中的数据表


def get_imgurl(itemurl): #建造进入房子主页获取大图链接的函数
web_data = requests.get(itemurl)
soup = BeautifulSoup(web_data.text,'lxml')
imgurl = str(soup.select('#curBigImage')[0])
return (imgurl.split('=')[3].strip('/>'))



def get_sheetdata(): #从网页获取数据并输入到数据库
paths = ['http://bj.xiaozhu.com/search-duanzufang-p{}-0/'.format(str(i)) for i in (range(1,4))] #明确网页路径组
for path in paths: #针对每个路径,获取对应数据


web_data = requests.get(path) #获取网页代码
soup = BeautifulSoup(web_data.text,'lxml') #用BeautifulSoup,'lxml'方式解析网页代码
titles = soup.select('#page_list > ul > li > a > img') #获取标题
pics = soup.select('#page_list > ul > li > a') #获取图片地址
adds = soup.select('#page_list > ul > li > div.result_btm_con.lodgeunitname > div > em') #获取地址
prices = soup.select('#page_list > ul > li > div.result_btm_con.lodgeunitname > span.result_price > i') #获取价格

for title,pic,add,price in zip(titles,pics,adds,prices): #构造住房信息的单元字典
data = {
'title' : title.get('title'),
'pic' : get_imgurl(pic.get('href')),
'add' : add.get_text().split('\n')[-1].strip(' '), #将信息中的'\n'消除,从列表中地址所在的位置提取地址并消除前后的空格
'price' : int(price.get_text()) #将字符串转换为整数,以便于之后筛选
}
sheet_tab.insert_one(data) #将单元字典输入到数据库

get_sheetdata()

for item in sheet_tab.find({'price':{'$gt':500}}):
print (item)

11 changes: 11 additions & 0 deletions 2.1练习作业提交/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Github 协作的简易指南

首先,每个实战计划的同学都需要 Fork 这个项目,然后你可以做这2件事情:

## 看源码
- 可以在「课程案例」、「练习题答案」看到源码,模仿学习

## 交作业
- 在 Github客户端把项目 clone 到本地,创建以你姓名全拼命名的分支(branch)
- 在本地找到相应的「作业提交」的文件夹中,并在里面建一个以你的姓名全拼命名的文件夹,把你的作业放进去
- 到 Github 客户端,从你的分支提交代码到 master,并且同步,然后 pull request(详细的图文步骤看课程里面的Github协作指南)。成功提交之后你自己也能看到pull 的链接。
Loading