Merge remote-tracking branch 'hitalex/master'

Conflicts:
	README.md
This commit is contained in:
Vinta 2015-01-23 00:33:09 +08:00
commit 92bf17c725

View File

@ -619,6 +619,8 @@ A curated list of awesome Python frameworks, libraries and software. Inspired by
* [MechanicalSoup](https://github.com/hickford/MechanicalSoup) - A Python library for automating interaction with websites.
* [mechanize](http://wwwsearch.sourceforge.net/mechanize/) - Stateful programmatic web browsing.
* [Demiurge](https://github.com/matiasb/demiurge) - PyQuery-based scraping micro-framework.
* [cola](https://github.com/chineking/cola) - A distributed crawling framework.
* [pyspider](https://github.com/binux/pyspider) - A powerful spider system.
## Web Content Extracting