Skip to content

Commit 9af29d9

Browse files
SunRunAwaySunRunAway
committed
fix
1 parent ae3cc77 commit 9af29d9

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

‎docs/README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ SDK 下载地址：<https://github.com/qiniu/python-sdk/tags>
2525
- [下载文件](#io-get)
2626
- [下载公有文件](#io-get-public)
2727
- [下载私有文件](#io-get-private)
28-
- [HTTPS 支持](#io-https-get)
2928
- [断点续下载](#resumable-io-get)
3029
- [资源操作](#rs)
3130
- [获取文件信息](#rs-stat)
@@ -238,7 +237,7 @@ extra.mime_type = "text/plain"
238237
data = StringIO.StringIO("hello!")
239238
ret, err = qiniu.io.put(uptoken, key, data, extra)
240239
if err is not None:
241-
error(err)
240+
sys.stderr.write('error: %s ' % err)
242241
return
243242
```
244243

@@ -256,7 +255,7 @@ localfile = "%s" % __file__
256255
257256
ret, err = qiniu.io.put_file(uptoken, key, localfile)
258257
if err is not None:
259-
error(err)
258+
sys.stderr.write('error: %s ' % err)
260259
return
261260
```
262261

@@ -294,7 +293,7 @@ extra = rio.PutExtra(bucket_name)
294293
extra.mime_type = "text/plain"
295294
ret, err = rio.put(uptoken, key, ResumableUpload(a), len(a), extra)
296295
if err is not None:
297-
error(err)
296+
sys.stderr.write('error: %s ' % err)
298297
return
299298
print ret,
300299
```
@@ -313,7 +312,7 @@ extra = rio.PutExtra(bucket_name)
313312
314313
ret, err = rio.put_file(uptoken, key, localfile, extra)
315314
if err is not None:
316-
error(err)
315+
sys.stderr.write('error: %s ' % err)
317316
return
318317
print ret,
319318
```
@@ -384,7 +383,7 @@ import qiniu.rs
384383
385384
ret, err = qiniu.rs.Client().stat(bucket_name, key)
386385
if err is not None:
387-
error(err)
386+
sys.stderr.write('error: %s ' % err)
388387
return
389388
print ret,
390389
```
@@ -403,7 +402,7 @@ import qiniu.rs
403402
404403
ret, err = qiniu.rs.Client().copy(bucket_name, key, bucket_name, key2)
405404
if err is not None:
406-
error(err)
405+
sys.stderr.write('error: %s ' % err)
407406
return
408407
```
409408

@@ -421,7 +420,7 @@ import qiniu.rs
421420
422421
ret, err = qiniu.rs.Client().move(bucket_name, key2, bucket_name, key3)
423422
if err is not None:
424-
error(err)
423+
sys.stderr.write('error: %s ' % err)
425424
return
426425
```
427426

@@ -439,7 +438,7 @@ import qiniu.rs
439438
440439
ret, err = qiniu.rs.Client().delete(bucket_name, key3)
441440
if err is not None:
442-
error(err)
441+
sys.stderr.write('error: %s ' % err)
443442
return
444443
```
445444

@@ -466,7 +465,7 @@ path_3 = qiniu.rs.EntryPath(bucket_name, key3)
466465
467466
rets, err = qiniu.rs.Client().batch_stat([path_1, path_2, path_3])
468467
if err is not None:
469-
error(err)
468+
sys.stderr.write('error: %s ' % err)
470469
return
471470
```
472471

@@ -487,7 +486,7 @@ path_3 = qiniu.rs.EntryPath(bucket_name, key3)
487486
pair_1 = qiniu.rs.EntryPathPair(path_1, path_3)
488487
rets, err = qiniu.rs.Client().batch_copy([pair_1])
489488
if not rets[0]['code'] == 200:
490-
error("复制失败")
489+
sys.stderr.write('error: %s ' % "复制失败")
491490
return
492491
```
493492

@@ -508,7 +507,7 @@ path_3 = qiniu.rs.EntryPath(bucket_name, key3)
508507
pair_2 = qiniu.rs.EntryPathPair(path_3, path_2)
509508
rets, err = qiniu.rs.Client().batch_move([pair_2])
510509
if not rets[0]['code'] == 200:
511-
error("移动失败")
510+
sys.stderr.write('error: %s ' % "移动失败")
512511
return
513512
```
514513

@@ -528,14 +527,15 @@ path_3 = qiniu.rs.EntryPath(bucket_name, key3)
528527
529528
rets, err = qiniu.rs.Client().batch_delete([path_1, path_2])
530529
if not [ret['code'] for ret in rets] == [200, 200]:
531-
error("删除失败")
530+
sys.stderr.write('error: %s ' % "删除失败")
532531
return
533532
```
534533

535534

536535
<a name="rsf"></a>
537536
### 高级管理操作
538537

538+
<a name="list-prefix"></a>
539539
#### 列出文件
540540

541541
请求某个存储空间（bucket）下的文件列表，如果有前缀，可以按前缀（prefix）进行过滤；如果前一次返回marker就表示还有资源，下一步请求需要将marker参数填上。
@@ -550,23 +550,23 @@ import qiniu.rsf
550550
551551
rets, err = qiniu.rsf.Client().list_prefix(bucket_name, prefix="test", limit=2)
552552
if err is not None:
553-
error(err)
553+
sys.stderr.write('error: %s ' % err)
554554
return
555555
print rets
556556
557557
# 从上一次list_prefix的位置继续列出文件
558558
rets2, err = qiniu.rsf.Client().list_prefix(bucket_name, prefix="test", limit=1, marker=rets['marker'])
559559
if err is not None:
560-
error(err)
560+
sys.stderr.write('error: %s ' % err)
561561
return
562562
print rets2
563563
```
564564
<a name="fop"></a>
565-
566565
### 云处理
567-
<a name="fop-image"></a>
568566

567+
<a name="fop-image"></a>
569568
#### 图像
569+
570570
<a name="fop-image-info"></a>
571571
##### 查看图像属性
572572
```{python}

‎docs/demo.py

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ def getenv(name):
6363
exit(1)
6464
return env
6565

66-
def error(obj):
67-
sys.stderr.write('error: %s ' % obj)
68-
6966
def get_demo_list():
7067
return [put_file, put_binary,
7168
resumable_put, resumable_put_file,
@@ -100,7 +97,7 @@ def put_file():
10097

10198
ret, err = qiniu.io.put_file(uptoken, key, localfile)
10299
if err is not None:
103-
error(err)
100+
sys.stderr.write('error: %s ' % err)
104101
return
105102
# @endgist
106103

@@ -118,7 +115,7 @@ def put_binary():
118115
data = StringIO.StringIO("hello!")
119116
ret, err = qiniu.io.put(uptoken, key, data, extra)
120117
if err is not None:
121-
error(err)
118+
sys.stderr.write('error: %s ' % err)
122119
return
123120
# @endgist
124121

@@ -143,7 +140,7 @@ def read(self, length):
143140
extra.mime_type = "text/plain"
144141
ret, err = rio.put(uptoken, key, ResumableUpload(a), len(a), extra)
145142
if err is not None:
146-
error(err)
143+
sys.stderr.write('error: %s ' % err)
147144
return
148145
print ret,
149146
# @endgist
@@ -160,7 +157,7 @@ def resumable_put_file():
160157

161158
ret, err = rio.put_file(uptoken, key, localfile, extra)
162159
if err is not None:
163-
error(err)
160+
sys.stderr.write('error: %s ' % err)
164161
return
165162
print ret,
166163
# @endgist
@@ -171,7 +168,7 @@ def stat():
171168
# @gist stat
172169
ret, err = qiniu.rs.Client().stat(bucket_name, key)
173170
if err is not None:
174-
error(err)
171+
sys.stderr.write('error: %s ' % err)
175172
return
176173
print ret,
177174
# @endgist
@@ -184,13 +181,13 @@ def copy():
184181
# @gist copy
185182
ret, err = qiniu.rs.Client().copy(bucket_name, key, bucket_name, key2)
186183
if err is not None:
187-
error(err)
184+
sys.stderr.write('error: %s ' % err)
188185
return
189186
# @endgist
190187

191188
stat, err = qiniu.rs.Client().stat(bucket_name, key2)
192189
if err is not None:
193-
error(err)
190+
sys.stderr.write('error: %s ' % err)
194191
return
195192
print 'new file:', stat,
196193

@@ -202,34 +199,34 @@ def move():
202199
# @gist move
203200
ret, err = qiniu.rs.Client().move(bucket_name, key2, bucket_name, key3)
204201
if err is not None:
205-
error(err)
202+
sys.stderr.write('error: %s ' % err)
206203
return
207204
# @endgist
208205

209206
# 查看文件是否移动成功
210207
ret, err = qiniu.rs.Client().stat(bucket_name, key3)
211208
if err is not None:
212-
error(err)
209+
sys.stderr.write('error: %s ' % err)
213210
return
214211

215212
# 查看文件是否被删除
216213
ret, err = qiniu.rs.Client().stat(bucket_name, key2)
217214
if err is None:
218-
error("删除失败")
215+
sys.stderr.write('error: %s ' % "删除失败")
219216
return
220217

221218
def delete():
222219
''' 删除文件 '''
223220
# @gist delete
224221
ret, err = qiniu.rs.Client().delete(bucket_name, key3)
225222
if err is not None:
226-
error(err)
223+
sys.stderr.write('error: %s ' % err)
227224
return
228225
# @endgist
229226

230227
ret, err = qiniu.rs.Client().stat(bucket_name, key3)
231228
if err is None:
232-
error("删除失败")
229+
sys.stderr.write('error: %s ' % "删除失败")
233230
return
234231

235232
def image_info():
@@ -295,19 +292,19 @@ def batch():
295292
# @gist batch_stat
296293
rets, err = qiniu.rs.Client().batch_stat([path_1, path_2, path_3])
297294
if err is not None:
298-
error(err)
295+
sys.stderr.write('error: %s ' % err)
299296
return
300297
# @endgist
301298
if not [ret['code'] for ret in rets] == [200, 612, 612]:
302-
error("批量获取状态与预期不同")
299+
sys.stderr.write('error: %s ' % "批量获取状态与预期不同")
303300
return
304301

305302
# 复制
306303
# @gist batch_copy
307304
pair_1 = qiniu.rs.EntryPathPair(path_1, path_3)
308305
rets, err = qiniu.rs.Client().batch_copy([pair_1])
309306
if not rets[0]['code'] == 200:
310-
error("复制失败")
307+
sys.stderr.write('error: %s ' % "复制失败")
311308
return
312309
# @endgist
313310

@@ -316,15 +313,15 @@ def batch():
316313
pair_2 = qiniu.rs.EntryPathPair(path_3, path_2)
317314
rets, err = qiniu.rs.Client().batch_move([pair_2])
318315
if not rets[0]['code'] == 200:
319-
error("移动失败")
316+
sys.stderr.write('error: %s ' % "移动失败")
320317
return
321318
# @endgist
322319

323320
# 删除残留文件
324321
# @gist batch_delete
325322
rets, err = qiniu.rs.Client().batch_delete([path_1, path_2])
326323
if not [ret['code'] for ret in rets] == [200, 200]:
327-
error("删除失败")
324+
sys.stderr.write('error: %s ' % "删除失败")
328325
return
329326
# @endgist
330327

@@ -333,14 +330,14 @@ def list_prefix():
333330
# @gist list_prefix
334331
rets, err = qiniu.rsf.Client().list_prefix(bucket_name, prefix="test", limit=2)
335332
if err is not None:
336-
error(err)
333+
sys.stderr.write('error: %s ' % err)
337334
return
338335
print rets
339-
336+
340337
# 从上一次list_prefix的位置继续列出文件
341338
rets2, err = qiniu.rsf.Client().list_prefix(bucket_name, prefix="test", limit=1, marker=rets['marker'])
342339
if err is not None:
343-
error(err)
340+
sys.stderr.write('error: %s ' % err)
344341
return
345342
print rets2
346343
# @endgist

0 commit comments

Comments
 (0)