Skip to content

Commit 504fbec

Browse files
xushiweixushiwei
committed
Merge pull request #51 from qiniu/develop
Release v6.0.1 (patch)
2 parents 37ac61d + ebf4182 commit 504fbec

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

‎docs/README.md

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ Qiniu Resource Storage SDK for Python
6262
在获取到 Access Key 和 Secret Key 之后，您可以在您的程序中调用如下两行代码进行初始化对接, 要确保`ACCESS_KEY` 和 `SECRET_KEY` 在调用所有七牛API服务之前均已赋值：
6363

6464
```{python}
65-
import qiniu.config
65+
import qiniu.conf
6666
67-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
68-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
67+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
68+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
6969
```
7070

7171
<a name=rs-api></a>
@@ -74,10 +74,10 @@ qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
7474
<a name=rs-stat></a>
7575
### 3.1 查看单个文件属性信息
7676
```{python}
77-
import qiniu.config
77+
import qiniu.conf
7878
79-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
80-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
79+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
80+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
8181
8282
import qiniu.rs
8383
@@ -91,10 +91,10 @@ print ret,
9191
<a name=rs-copy></a>
9292
### 3.2 复制单个文件
9393
```{python}
94-
import qiniu.config
94+
import qiniu.conf
9595
96-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
97-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
96+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
97+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
9898
9999
import qiniu.rs
100100
@@ -107,10 +107,10 @@ if err is not None:
107107
<a name=rs-move></a>
108108
### 3.3 移动单个文件
109109
```{python}
110-
import qiniu.config
110+
import qiniu.conf
111111
112-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
113-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
112+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
113+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
114114
115115
import qiniu.rs
116116
@@ -123,10 +123,10 @@ if err is not None:
123123
<a name=rs-delete></a>
124124
### 3.4 删除单个文件
125125
```{python}
126-
import qiniu.config
126+
import qiniu.conf
127127
128-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
129-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
128+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
129+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
130130
131131
import qiniu.rs
132132
@@ -142,10 +142,10 @@ if err is not None:
142142
<a name=batch-stat></a>
143143
#### 3.5.1 批量获取文件属性信息
144144
```{python}
145-
import qiniu.config
145+
import qiniu.conf
146146
147-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
148-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
147+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
148+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
149149
150150
import qiniu.rs
151151
@@ -162,10 +162,10 @@ if err is not None:
162162
<a name=batch-copy></a>
163163
#### 3.5.2 批量复制文件
164164
```{python}
165-
import qiniu.config
165+
import qiniu.conf
166166
167-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
168-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
167+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
168+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
169169
170170
import qiniu.rs
171171
@@ -183,10 +183,10 @@ if not rets[0]['code'] == 200:
183183
<a name=batch-move></a>
184184
#### 3.5.3 批量移动文件
185185
```{python}
186-
import qiniu.config
186+
import qiniu.conf
187187
188-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
189-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
188+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
189+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
190190
191191
import qiniu.rs
192192
@@ -204,10 +204,10 @@ if not rets[0]['code'] == 200:
204204
<a name=batch-delete></a>
205205
#### 3.5.4 批量删除文件
206206
```{python}
207-
import qiniu.config
207+
import qiniu.conf
208208
209-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
210-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
209+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
210+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
211211
212212
import qiniu.rs
213213
@@ -230,10 +230,10 @@ if not [ret['code'] for ret in rets] == [200, 200]:
230230
#### 4.1.1 上传授权uptoken
231231
uptoken是一个字符串，作为http协议Header的一部分（Authorization字段）发送到我们七牛的服务端，表示这个http请求是经过认证的。
232232
```{python}
233-
import qiniu.config
233+
import qiniu.conf
234234
235-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
236-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
235+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
236+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
237237
238238
import qiniu.rs
239239
@@ -252,10 +252,10 @@ uptoken = policy.token()
252252

253253
直接上传二进制流
254254
```{python}
255-
import qiniu.config
255+
import qiniu.conf
256256
257-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
258-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
257+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
258+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
259259
260260
import qiniu.io
261261
@@ -271,10 +271,10 @@ if err is not None:
271271
上传本地文件
272272

273273
```{python}
274-
import qiniu.config
274+
import qiniu.conf
275275
276-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
277-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
276+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
277+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
278278
279279
import qiniu.io
280280
@@ -291,10 +291,10 @@ if err is not None:
291291
### 4.2.2 断点续上传
292292
上传二进制流
293293
```{python}
294-
import qiniu.config
294+
import qiniu.conf
295295
296-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
297-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
296+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
297+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
298298
299299
import qiniu.resumable_io as rio
300300
@@ -320,10 +320,10 @@ print ret,
320320

321321
上传本地文件
322322
```{python}
323-
import qiniu.config
323+
import qiniu.conf
324324
325-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
326-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
325+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
326+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
327327
328328
import qiniu.resumable_io as rio
329329
@@ -363,10 +363,10 @@ print ret,
363363
私有下载链接可以使用 SDK 提供的如下方法生成：
364364

365365
```{python}
366-
import qiniu.config
366+
import qiniu.conf
367367
368-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
369-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
368+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
369+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
370370
371371
import qiniu.rs
372372
@@ -384,10 +384,10 @@ private_url = policy.make_request(base_url)
384384
<a name=fop-image-info></a>
385385
### 5.1.1 查看图像属性
386386
```{python}
387-
import qiniu.config
387+
import qiniu.conf
388388
389-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
390-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
389+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
390+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
391391
392392
import qiniu.fop
393393
import qiniu.rs
@@ -409,10 +409,10 @@ print '可以在浏览器浏览: %s' % url
409409
<a name=fop-exif></a>
410410
### 5.1.2 查看图片EXIF信息
411411
```{python}
412-
import qiniu.config
412+
import qiniu.conf
413413
414-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
415-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
414+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
415+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
416416
417417
import qiniu.fop
418418
import qiniu.rs
@@ -435,10 +435,10 @@ print '可以在浏览器浏览: %s' % url
435435
<a name=fop-image-view></a>
436436
### 5.1.3 生成图片预览
437437
```{python}
438-
import qiniu.config
438+
import qiniu.conf
439439
440-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
441-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
440+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
441+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
442442
443443
import qiniu.fop
444444
import qiniu.rs

‎docs/gist/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# @gist config
2-
import qiniu.config
2+
import qiniu.conf
33

4-
qiniu.config.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
5-
qiniu.config.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
4+
qiniu.conf.ACCESS_KEY = "<YOUR_APP_ACCESS_KEY>"
5+
qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
66
# @endgist

0 commit comments

Comments
 (0)