Skip to content

Commit cd6e170

Browse files
xushiweixushiwei
committed
Merge pull request #44 from SunRunAway/feature/large_photo
remove the large photo
2 parents ab1ffb8 + 9fafdf1 commit cd6e170

File tree

10 files changed

+71
-67
lines changed

10 files changed

+71
-67
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ before_script:
1111
- export QINIU_DOMAIN="pysdk.qiniudn.com"
1212
script:
1313
- python setup.py nosetests
14-
- python demo.py
14+
- export PYTHONPATH="$PYTHONPATH:." && python docs/demo.py

‎docs/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
all:
2+
gist README.gist.md > README.md
3+

‎docs/README.gist.md

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -73,39 +73,39 @@ Qiniu Resource Storage SDK for Python
7373
```{python}
7474
@gist(gist/conf.py#config)
7575
76-
@gist(../demo.py#import_rs)
76+
@gist(demo.py#import_rs)
7777
78-
@gist(../demo.py#stat)
78+
@gist(demo.py#stat)
7979
```
8080

8181
<a name=rs-copy></a>
8282
### 3.2 复制单个文件
8383
```{python}
8484
@gist(gist/conf.py#config)
8585
86-
@gist(../demo.py#import_rs)
86+
@gist(demo.py#import_rs)
8787
88-
@gist(../demo.py#copy)
88+
@gist(demo.py#copy)
8989
```
9090

9191
<a name=rs-move></a>
9292
### 3.3 移动单个文件
9393
```{python}
9494
@gist(gist/conf.py#config)
9595
96-
@gist(../demo.py#import_rs)
96+
@gist(demo.py#import_rs)
9797
98-
@gist(../demo.py#move)
98+
@gist(demo.py#move)
9999
```
100100

101101
<a name=rs-delete></a>
102102
### 3.4 删除单个文件
103103
```{python}
104104
@gist(gist/conf.py#config)
105105
106-
@gist(../demo.py#import_rs)
106+
@gist(demo.py#import_rs)
107107
108-
@gist(../demo.py#move)
108+
@gist(demo.py#move)
109109
```
110110

111111
<a name=batch></a>
@@ -116,47 +116,47 @@ Qiniu Resource Storage SDK for Python
116116
```{python}
117117
@gist(gist/conf.py#config)
118118
119-
@gist(../demo.py#import_rs)
119+
@gist(demo.py#import_rs)
120120
121-
@gist(../demo.py#batch_path)
121+
@gist(demo.py#batch_path)
122122
123-
@gist(../demo.py#batch_stat)
123+
@gist(demo.py#batch_stat)
124124
```
125125

126126
<a name=batch-copy></a>
127127
#### 3.5.2 批量复制文件
128128
```{python}
129129
@gist(gist/conf.py#config)
130130
131-
@gist(../demo.py#import_rs)
131+
@gist(demo.py#import_rs)
132132
133-
@gist(../demo.py#batch_path)
133+
@gist(demo.py#batch_path)
134134
135-
@gist(../demo.py#batch_copy)
135+
@gist(demo.py#batch_copy)
136136
```
137137

138138
<a name=batch-move></a>
139139
#### 3.5.3 批量移动文件
140140
```{python}
141141
@gist(gist/conf.py#config)
142142
143-
@gist(../demo.py#import_rs)
143+
@gist(demo.py#import_rs)
144144
145-
@gist(../demo.py#batch_path)
145+
@gist(demo.py#batch_path)
146146
147-
@gist(../demo.py#batch_move)
147+
@gist(demo.py#batch_move)
148148
```
149149

150150
<a name=batch-delete></a>
151151
#### 3.5.4 批量删除文件
152152
```{python}
153153
@gist(gist/conf.py#config)
154154
155-
@gist(../demo.py#import_rs)
155+
@gist(demo.py#import_rs)
156156
157-
@gist(../demo.py#batch_path)
157+
@gist(demo.py#batch_path)
158158
159-
@gist(../demo.py#batch_delete)
159+
@gist(demo.py#batch_delete)
160160
```
161161

162162
<a name=get-and-put-api></a>
@@ -170,9 +170,9 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
170170
```{python}
171171
@gist(gist/conf.py#config)
172172
173-
@gist(../demo.py#import_rs)
173+
@gist(demo.py#import_rs)
174174
175-
@gist(../demo.py#uptoken)
175+
@gist(demo.py#uptoken)
176176
```
177177

178178
<a name=upload></a>
@@ -188,19 +188,19 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
188188
```{python}
189189
@gist(gist/conf.py#config)
190190
191-
@gist(../demo.py#import_io)
191+
@gist(demo.py#import_io)
192192
193-
@gist(../demo.py#put)
193+
@gist(demo.py#put)
194194
```
195195

196196
上传本地文件
197197

198198
```{python}
199199
@gist(gist/conf.py#config)
200200
201-
@gist(../demo.py#import_io)
201+
@gist(demo.py#import_io)
202202
203-
@gist(../demo.py#put_file)
203+
@gist(demo.py#put_file)
204204
```
205205

206206
<a name=resumable-io-upload></a>
@@ -209,18 +209,18 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
209209
```{python}
210210
@gist(gist/conf.py#config)
211211
212-
@gist(../demo.py#import_resumable_io)
212+
@gist(demo.py#import_resumable_io)
213213
214-
@gist(../demo.py#resumable_put)
214+
@gist(demo.py#resumable_put)
215215
```
216216

217217
上传本地文件
218218
```{python}
219219
@gist(gist/conf.py#config)
220220
221-
@gist(../demo.py#import_resumable_io)
221+
@gist(demo.py#import_resumable_io)
222222
223-
@gist(../demo.py#resumable_put_file)
223+
@gist(demo.py#resumable_put_file)
224224
```
225225

226226
<a name=io-download></a>
@@ -251,9 +251,9 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
251251
```{python}
252252
@gist(gist/conf.py#config)
253253
254-
@gist(../demo.py#import_rs)
254+
@gist(demo.py#import_rs)
255255
256-
@gist(../demo.py#dntoken)
256+
@gist(demo.py#dntoken)
257257
```
258258

259259
<a name=fop-api></a>
@@ -267,21 +267,21 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
267267
```{python}
268268
@gist(gist/conf.py#config)
269269
270-
@gist(../demo.py#import_fop)
271-
@gist(../demo.py#import_rs)
270+
@gist(demo.py#import_fop)
271+
@gist(demo.py#import_rs)
272272
273-
@gist(../demo.py#image_info)
273+
@gist(demo.py#image_info)
274274
```
275275

276276
<a name=fop-exif></a>
277277
### 5.1.2 查看图片EXIF信息
278278
```{python}
279279
@gist(gist/conf.py#config)
280280
281-
@gist(../demo.py#import_fop)
282-
@gist(../demo.py#import_rs)
281+
@gist(demo.py#import_fop)
282+
@gist(demo.py#import_rs)
283283
284-
@gist(../demo.py#exif)
284+
@gist(demo.py#exif)
285285
```
286286

287287

@@ -290,10 +290,10 @@ uptoken是一个字符串，作为http协议Header的一部分（Authorization
290290
```{python}
291291
@gist(gist/conf.py#config)
292292
293-
@gist(../demo.py#import_fop)
294-
@gist(../demo.py#import_rs)
293+
@gist(demo.py#import_fop)
294+
@gist(demo.py#import_rs)
295295
296-
@gist(../demo.py#image_view)
296+
@gist(demo.py#image_view)
297297
```
298298

299299
<a name=contribution></a>

‎docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ import qiniu.fop
395395
import qiniu.rs
396396
397397
# 生成base_url
398-
url = qiniu.rs.make_base_url(domain, key2)
398+
url = qiniu.rs.make_base_url(domain, pic_key)
399399
400400
# 生成fop_url
401401
image_info = qiniu.fop.ImageInfo()
@@ -420,7 +420,7 @@ import qiniu.fop
420420
import qiniu.rs
421421
422422
# 生成base_url
423-
url = qiniu.rs.make_base_url(domain, key2)
423+
url = qiniu.rs.make_base_url(domain, pic_key)
424424
425425
# 生成fop_url
426426
image_exif = qiniu.fop.Exif()
@@ -449,7 +449,7 @@ iv = qiniu.fop.ImageView()
449449
iv.width = 100
450450
451451
# 生成base_url
452-
url = qiniu.rs.make_base_url(domain, key2)
452+
url = qiniu.rs.make_base_url(domain, pic_key)
453453
# 生成fop_url
454454
url = iv.make_request(url)
455455
# 对其签名，生成private_url。如果是公有bucket此步可以省略

‎demo.py renamed to ‎docs/demo.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@
2424
key2 = None
2525
key3 = None
2626
domain = None
27+
pic_key = None
2728

2829
# ----------------------------------------------------------
2930

30-
def setup(access_key, secret_key, bucketname, bucket_domain):
31-
global bucket_name, uptoken, key, key2, domain, key3
31+
def setup(access_key, secret_key, bucketname, bucket_domain, pickey):
32+
global bucket_name, uptoken, key, key2, domain, key3, pic_key
3233
qiniu.conf.ACCESS_KEY = access_key
3334
qiniu.conf.SECRET_KEY = secret_key
3435
bucket_name = bucketname
3536
domain = bucket_domain
37+
pic_key = pickey
3638
# @gist uptoken
3739
policy = qiniu.rs.PutPolicy(bucket_name)
3840
uptoken = policy.token()
@@ -49,7 +51,8 @@ def _setup():
4951
secret_key = getenv("QINIU_SECRET_KEY")
5052
bucket_name = getenv("QINIU_BUCKET_NAME")
5153
domain = getenv("QINIU_DOMAIN")
52-
setup(access_key, secret_key, bucket_name, domain)
54+
pickey = getenv("QINIU_PIC_KEY")
55+
setup(access_key, secret_key, bucket_name, domain, pickey)
5356

5457
def getenv(name):
5558
env = os.getenv(name)
@@ -227,21 +230,11 @@ def delete():
227230
return
228231

229232
def image_info():
230-
''' 上传图片, 并且查看他的信息 '''
231-
# 初始化
232-
qiniu.rs.Client().delete(bucket_name, key2)
233+
''' 查看图片的信息 '''
233234

234-
extra = qiniu.io.PutExtra(bucket_name)
235-
extra.mime_type = "image/png"
236-
localfile = 'qiniu/test/photo_test.jpeg'
237-
ret, err = qiniu.io.put_file(uptoken, key2, localfile, extra)
238-
if err is not None:
239-
error(err)
240-
return
241-
242235
# @gist image_info
243236
# 生成base_url
244-
url = qiniu.rs.make_base_url(domain, key2)
237+
url = qiniu.rs.make_base_url(domain, pic_key)
245238

246239
# 生成fop_url
247240
image_info = qiniu.fop.ImageInfo()
@@ -258,7 +251,7 @@ def image_exif():
258251
''' 查看图片的exif信息 '''
259252
# @gist exif
260253
# 生成base_url
261-
url = qiniu.rs.make_base_url(domain, key2)
254+
url = qiniu.rs.make_base_url(domain, pic_key)
262255

263256
# 生成fop_url
264257
image_exif = qiniu.fop.Exif()
@@ -278,7 +271,7 @@ def image_view():
278271
iv.width = 100
279272

280273
# 生成base_url
281-
url = qiniu.rs.make_base_url(domain, key2)
274+
url = qiniu.rs.make_base_url(domain, pic_key)
282275
# 生成fop_url
283276
url = iv.make_request(url)
284277
# 对其签名，生成private_url。如果是公有bucket此步可以省略

‎qiniu/rs/test/__init__.py

Whitespace-only changes.

‎qiniu/rs/test/rs_token_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def test_get_policy(self):
3838

3939
f = urllib.urlopen(private_url)
4040
body = f.read()
41+
f.close()
4142
self.assertEqual(len(body)>100, True)
4243

4344

‎qiniu/test/__init__.py

Whitespace-only changes.

‎qiniu/test/resumable_io_test.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
import os
33
import unittest
44
import zlib
5+
import urllib
6+
import tempfile
7+
import shutil
58

69
from qiniu import conf
710
from qiniu.auth import up
@@ -38,14 +41,21 @@ def test_block(self):
3841
rs.Client().delete(bucket, key)
3942

4043
def test_put(self):
44+
src = urllib.urlopen("http://cheneya.qiniudn.com/hello_jpg")
45+
dst = tempfile.NamedTemporaryFile()
46+
shutil.copyfileobj(src, dst)
47+
src.close()
48+
4149
policy = rs.PutPolicy(bucket)
4250
extra = resumable_io.PutExtra(bucket)
4351
extra.bucket = bucket
4452
key = "sdk_py_resumable_block_5"
45-
localfile = os.path.abspath(os.path.dirname(__file__)) + "/photo_test.jpeg"
53+
localfile = dst.name
4654
ret, err = resumable_io.put_file(policy.token(), key, localfile, extra)
55+
dst.close()
56+
4757
assert err is None, err
48-
self.assertEqual(ret["hash"], "FggslKhqmufiC1VkQvuF2gtvve9P", "hash not match")
58+
self.assertEqual(ret["hash"], "FnyTMUqPNRTdk1Wou7oLqDHkBm_p", "hash not match")
4959
rs.Client().delete(bucket, key)
5060

5161

‎setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
license='MIT',
2929
url=URL,
3030
packages=['qiniu', 'qiniu.test', 'qiniu.auth', 'qiniu.rs', 'qiniu.rs.test'],
31-
package_data={
32-
"qiniu.test": ['photo_test.jpeg'],
33-
},
3431
platforms='any',
3532
classifiers=[
3633
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)