Skip to content

Commit 3e9e48a

Browse files
authored
Merge pull request #510 from leancloud/release-291
docs: release 2.9.1
2 parents 158f9bb + b49a2c8 commit 3e9e48a

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ Python 2.7 and Python 3.6+.
2727
Install dependencies:
2828

2929
```sh
30-
pip install Sphinx
31-
pip install sphinx_rtd_theme
30+
pip install Sphinx sphinx_rtd_theme
3231
```
3332

3433
```sh

changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [2.9.1] - 2021-03-03
2+
### Changed
3+
- Update dependencies: really support Python 3.9 and drop support for Python 3.5.
4+
15
## [2.9.0] - 2020-11-26
26
### Added
37
- Allow specifying uploaded file path with MasterKey.

docs/_modules/leancloud/file_.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ <h1>leancloud.file_ 源代码</h1><div class="highlight"><pre>
160160
<span class="kn">import</span> <span class="nn">re</span>
161161
<span class="kn">import</span> <span class="nn">io</span>
162162
<span class="kn">import</span> <span class="nn">hashlib</span>
163-
<span class="kn">import</span> <span class="nn">uuid</span>
164163
<span class="kn">import</span> <span class="nn">logging</span>
165164
<span class="kn">import</span> <span class="nn">threading</span>
166165

@@ -185,6 +184,7 @@ <h1>leancloud.file_ 源代码</h1><div class="highlight"><pre>
185184

186185
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="o">=</span><span class="s2">&quot;&quot;</span><span class="p">,</span> <span class="n">data</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">mime_type</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
187186
<span class="bp">self</span><span class="o">.</span><span class="n">_name</span> <span class="o">=</span> <span class="n">name</span>
187+
<span class="bp">self</span><span class="o">.</span><span class="n">key</span> <span class="o">=</span> <span class="kc">None</span>
188188
<span class="bp">self</span><span class="o">.</span><span class="n">id</span> <span class="o">=</span> <span class="kc">None</span>
189189
<span class="bp">self</span><span class="o">.</span><span class="n">_url</span> <span class="o">=</span> <span class="kc">None</span>
190190
<span class="bp">self</span><span class="o">.</span><span class="n">_acl</span> <span class="o">=</span> <span class="kc">None</span>
@@ -465,21 +465,19 @@ <h1>leancloud.file_ 源代码</h1><div class="highlight"><pre>
465465
<span class="bp">self</span><span class="o">.</span><span class="n">_metadata</span> <span class="o">=</span> <span class="n">server_data</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;metaData&quot;</span><span class="p">)</span>
466466

467467
<span class="k">def</span> <span class="nf">_get_file_token</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
468-
<span class="n">key</span> <span class="o">=</span> <span class="n">uuid</span><span class="o">.</span><span class="n">uuid4</span><span class="p">()</span><span class="o">.</span><span class="n">hex</span>
469-
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">extension</span><span class="p">:</span>
470-
<span class="n">key</span> <span class="o">=</span> <span class="s2">&quot;</span><span class="si">{0}</span><span class="s2">.</span><span class="si">{1}</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">extension</span><span class="p">)</span>
471468
<span class="n">data</span> <span class="o">=</span> <span class="p">{</span>
472469
<span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">_name</span><span class="p">,</span>
473-
<span class="s2">&quot;key&quot;</span><span class="p">:</span> <span class="n">key</span><span class="p">,</span>
474470
<span class="s2">&quot;ACL&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">_acl</span><span class="p">,</span>
475471
<span class="s2">&quot;mime_type&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">mime_type</span><span class="p">,</span>
476472
<span class="s2">&quot;metaData&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">_metadata</span><span class="p">,</span>
477473
<span class="p">}</span>
474+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">key</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
475+
<span class="n">data</span><span class="p">[</span><span class="s2">&quot;key&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">key</span>
478476
<span class="n">response</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">post</span><span class="p">(</span><span class="s2">&quot;/fileTokens&quot;</span><span class="p">,</span> <span class="n">data</span><span class="p">)</span>
479477
<span class="n">content</span> <span class="o">=</span> <span class="n">response</span><span class="o">.</span><span class="n">json</span><span class="p">()</span>
480478
<span class="bp">self</span><span class="o">.</span><span class="n">id</span> <span class="o">=</span> <span class="n">content</span><span class="p">[</span><span class="s2">&quot;objectId&quot;</span><span class="p">]</span>
481479
<span class="bp">self</span><span class="o">.</span><span class="n">_url</span> <span class="o">=</span> <span class="n">content</span><span class="p">[</span><span class="s2">&quot;url&quot;</span><span class="p">]</span>
482-
<span class="n">content</span><span class="p">[</span><span class="s2">&quot;key&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">key</span>
480+
<span class="bp">self</span><span class="o">.</span><span class="n">key</span> <span class="o">=</span> <span class="n">content</span><span class="p">[</span><span class="s2">&quot;key&quot;</span><span class="p">]</span>
483481
<span class="k">return</span> <span class="n">content</span>
484482

485483
<div class="viewcode-block" id="File.fetch"><a class="viewcode-back" href="../../index.html#leancloud.File.fetch">[文档]</a> <span class="k">def</span> <span class="nf">fetch</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
setup(
3131
name='leancloud',
32-
version='2.9.0',
32+
version='2.9.1',
3333
description='LeanCloud Python SDK',
3434
url='https://leancloud.cn/',
3535
author='asaka',

0 commit comments

Comments
 (0)