Skip to content

Release v6.0.1 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jun 27, 2013
Merged

Release v6.0.1 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d466c38
Update README.gist.md
xushiwei Jun 26, 2013
0c9178a
Update __init__.py
xushiwei Jun 26, 2013
ab1ffb8
Update __init__.py
xushiwei Jun 26, 2013
0043169
remove the large photo
SunRunAway Jun 26, 2013
102bb86
version=6.0.1-3
SunRunAway Jun 26, 2013
0e56ce7
fix doc
SunRunAway Jun 26, 2013
938f4ff
fix
SunRunAway Jun 26, 2013
8ce254d
fix conflict
SunRunAway Jun 26, 2013
9fafdf1
add __init__.py in tests
SunRunAway Jun 26, 2013
3e2bc76
fix
SunRunAway Jun 26, 2013
cd6e170
Merge pull request #44 from SunRunAway/feature/large_photo
xushiwei Jun 27, 2013
d433c55
Merge pull request #45 from SunRunAway/feature/fix_doc
xushiwei Jun 27, 2013
bba20b6
version, user-agent & remove image
SunRunAway Jun 27, 2013
96e335d
update DESCRIPTION
SunRunAway Jun 27, 2013
bed7e9e
rsf eof
SunRunAway Jun 27, 2013
e37d83d
Merge branch 'patch' into feature/rsf_eof
SunRunAway Jun 27, 2013
9003ef0
changelog
SunRunAway Jun 27, 2013
ccdc380
Merge pull request #46 from SunRunAway/patch
xushiwei Jun 27, 2013
9737402
update EOF & docstring
SunRunAway Jun 27, 2013
0d7f6e1
Merge pull request #47 from SunRunAway/feature/rsf_eof
xushiwei Jun 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ before_script:
- export QINIU_DOMAIN="pysdk.qiniudn.com"
script:
- python setup.py nosetests
- python demo.py
- export PYTHONPATH="$PYTHONPATH:." && python docs/demo.py
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
## CHANGE LOG

### v6.0.1

2013-06-27 issue [#43](https://github.com/qiniu/python-sdk/pull/43)

- 遵循 [sdkspec v6.0.2](https://github.com/qiniu/sdkspec/tree/v6.0.2)
- 现在，rsf.list_prefix在没有更多数据时，err 会返回 rsf.EOF

### v6.0.0

2013-06-26 issue [#42](https://github.com/qiniu/python-sdk/pull/42)
Expand Down
3 changes: 3 additions & 0 deletions docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
all:
gist README.gist.md > README.md

93 changes: 45 additions & 48 deletions docs/README.gist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Qiniu Resource (Cloud) Storage SDK for Python
Qiniu Resource Storage SDK for Python
===

# Python 2.x SDK 使用指南

此 Python SDK 适用于2.x版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v3/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
此 Python SDK 适用于2.x版本，基于 [七牛云存储官方API](http://docs.qiniu.com/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。

目录
----
Expand Down Expand Up @@ -58,8 +56,8 @@ Qiniu Resource (Cloud) Storage SDK for Python

要接入七牛云存储，您需要拥有一对有效的 Access Key 和 Secret Key 用来进行签名认证。可以通过如下步骤获得：

1. [开通七牛开发者帐号](https://dev.qiniutek.com/signup)
2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://dev.qiniutek.com/account/keys) 。
1. [开通七牛开发者帐号](https://portal.qiniu.com/signup)
2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://portal.qiniu.com/setting/key) 。

在获取到 Access Key 和 Secret Key 之后，您可以在您的程序中调用如下两行代码进行初始化对接, 要确保`ACCESS_KEY` 和 `SECRET_KEY` 在调用所有七牛API服务之前均已赋值：

Expand All @@ -75,39 +73,39 @@ Qiniu Resource (Cloud) Storage SDK for Python
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#stat)
@gist(demo.py#stat)
```

<a name=rs-copy></a>
### 3.2 复制单个文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#copy)
@gist(demo.py#copy)
```

<a name=rs-move></a>
### 3.3 移动单个文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#move)
@gist(demo.py#move)
```

<a name=rs-delete></a>
### 3.4 删除单个文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#move)
@gist(demo.py#move)
```

<a name=batch></a>
Expand All @@ -118,47 +116,47 @@ Qiniu Resource (Cloud) Storage SDK for Python
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#batch_path)
@gist(demo.py#batch_path)

@gist(../demo.py#batch_stat)
@gist(demo.py#batch_stat)
```

<a name=batch-copy></a>
#### 3.5.2 批量复制文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#batch_path)
@gist(demo.py#batch_path)

@gist(../demo.py#batch_copy)
@gist(demo.py#batch_copy)
```

<a name=batch-move></a>
#### 3.5.3 批量移动文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#batch_path)
@gist(demo.py#batch_path)

@gist(../demo.py#batch_move)
@gist(demo.py#batch_move)
```

<a name=batch-delete></a>
#### 3.5.4 批量删除文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#batch_path)
@gist(demo.py#batch_path)

@gist(../demo.py#batch_delete)
@gist(demo.py#batch_delete)
```

<a name=get-and-put-api></a>
Expand All @@ -172,9 +170,9 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#uptoken)
@gist(demo.py#uptoken)
```

<a name=upload></a>
Expand All @@ -190,19 +188,19 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_io)
@gist(demo.py#import_io)

@gist(../demo.py#put)
@gist(demo.py#put)
```

上传本地文件

```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_io)
@gist(demo.py#import_io)

@gist(../demo.py#put_file)
@gist(demo.py#put_file)
```

<a name=resumable-io-upload></a>
Expand All @@ -211,18 +209,18 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_resumable_io)
@gist(demo.py#import_resumable_io)

@gist(../demo.py#resumable_put)
@gist(demo.py#resumable_put)
```

上传本地文件
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_resumable_io)
@gist(demo.py#import_resumable_io)

@gist(../demo.py#resumable_put_file)
@gist(demo.py#resumable_put_file)
```

<a name=io-download></a>
Expand Down Expand Up @@ -253,9 +251,9 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_rs)
@gist(demo.py#import_rs)

@gist(../demo.py#dntoken)
@gist(demo.py#dntoken)
```

<a name=fop-api></a>
Expand All @@ -269,21 +267,21 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_fop)
@gist(../demo.py#import_rs)
@gist(demo.py#import_fop)
@gist(demo.py#import_rs)

@gist(../demo.py#image_info)
@gist(demo.py#image_info)
```

<a name=fop-exif></a>
### 5.1.2 查看图片EXIF信息
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_fop)
@gist(../demo.py#import_rs)
@gist(demo.py#import_fop)
@gist(demo.py#import_rs)

@gist(../demo.py#exif)
@gist(demo.py#exif)
```


Expand All @@ -292,10 +290,10 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
```{python}
@gist(gist/conf.py#config)

@gist(../demo.py#import_fop)
@gist(../demo.py#import_rs)
@gist(demo.py#import_fop)
@gist(demo.py#import_rs)

@gist(../demo.py#image_view)
@gist(demo.py#image_view)
```

<a name=contribution></a>
Expand All @@ -315,4 +313,3 @@ Copyright (c) 2013 qiniu.com
基于 MIT 协议发布:

* [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)

17 changes: 7 additions & 10 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Qiniu Resource (Cloud) Storage SDK for Python
Qiniu Resource Storage SDK for Python
===

# Python 2.x SDK 使用指南

此 Python SDK 适用于2.x版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v3/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
此 Python SDK 适用于2.x版本，基于 [七牛云存储官方API](http://docs.qiniu.com/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。

目录
----
Expand Down Expand Up @@ -58,8 +56,8 @@ Qiniu Resource (Cloud) Storage SDK for Python

要接入七牛云存储，您需要拥有一对有效的 Access Key 和 Secret Key 用来进行签名认证。可以通过如下步骤获得：

1. [开通七牛开发者帐号](https://dev.qiniutek.com/signup)
2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://dev.qiniutek.com/account/keys) 。
1. [开通七牛开发者帐号](https://portal.qiniu.com/signup)
2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://portal.qiniu.com/setting/key) 。

在获取到 Access Key 和 Secret Key 之后，您可以在您的程序中调用如下两行代码进行初始化对接, 要确保`ACCESS_KEY` 和 `SECRET_KEY` 在调用所有七牛API服务之前均已赋值：

Expand Down Expand Up @@ -395,7 +393,7 @@ import qiniu.fop
import qiniu.rs

# 生成base_url
url = qiniu.rs.make_base_url(domain, key2)
url = qiniu.rs.make_base_url(domain, pic_key)

# 生成fop_url
image_info = qiniu.fop.ImageInfo()
Expand All @@ -420,7 +418,7 @@ import qiniu.fop
import qiniu.rs

# 生成base_url
url = qiniu.rs.make_base_url(domain, key2)
url = qiniu.rs.make_base_url(domain, pic_key)

# 生成fop_url
image_exif = qiniu.fop.Exif()
Expand Down Expand Up @@ -449,7 +447,7 @@ iv = qiniu.fop.ImageView()
iv.width = 100

# 生成base_url
url = qiniu.rs.make_base_url(domain, key2)
url = qiniu.rs.make_base_url(domain, pic_key)
# 生成fop_url
url = iv.make_request(url)
# 对其签名，生成private_url。如果是公有bucket此步可以省略
Expand All @@ -476,4 +474,3 @@ Copyright (c) 2013 qiniu.com

* [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)


Loading