添加日记上传图片API
Merge pull request #1 from daydayfree/master

添加日记上传图片API
1. test_*.py: has_key 修改为 in; 2. framework.py: print, reduce 的 import
fix: from __future__ imports 必须位于文件最前面. 若不存在, 在python3.3.3下执行会报错SyntaxError
修改except后的','为as
1. douban_client/client.py: 显式相对import
2. tests/framework.py: 使用lib six的print_, input, reduce 兼容py2-3
3. tests/test_api_miniblog.py: 使用lib six的text_type兼容py2-3
requirments.txt: 增加six
Merge branch 'master' of github.com:liluo/douban-client
同步liluo分支, 消除冲突文件.

Merge branch 'master' into 2to3

Conflicts:
	douban_client/client.py
	tests/test_api_note.py
requirements.txt: py-oauth2最低版本修改为0.0.7
fix bug: DoubanApi -> DoubanAPI
使用flake8检查pep8错误时, 发现以下遗漏:
 1. test_api_album.py: line42, key 应为 ret
 2. test_api_note.py : has_key 该为 in 实现
清理不存在的API接口
Merge pull request #3 from daydayfree/master

清理不存在的API接口
继续清理一下
Merge pull request #4 from daydayfree/master

继续清理一下
Compatible with python 3.x
Fix code style
Merge from source master
Merge pull request #5 from daydayfree/master

Fix code style