Skip to content

Commit cbb3e7f

Browse files
author
travis-ci
committed
Update docs after merge to master.
1 parent 73a3291 commit cbb3e7f

7 files changed

Lines changed: 10 additions & 13 deletions

File tree

‎_modules/gcloud/storage/acl.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ <h1>Source code for gcloud.storage.acl</h1><div class="highlight"><pre>
182182
<span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">identifier</span><span class="p">:</span>
183183
<span class="k">return</span> <span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">type</span><span class="p">)</span>
184184
<span class="k">else</span><span class="p">:</span>
185-
<span class="k">return</span> <span class="s">&#39;{self.type}-{self.identifier}&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="bp">self</span><span class="o">=</span><span class="bp">self</span><span class="p">)</span>
185+
<span class="k">return</span> <span class="s">&#39;{acl.type}-{acl.identifier}&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">acl</span><span class="o">=</span><span class="bp">self</span><span class="p">)</span>
186186

187187
<span class="k">def</span> <span class="nf">__repr__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
188-
<span class="k">return</span> <span class="s">&#39;&lt;ACL Entity: {self} ({roles})&gt;&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span>
189-
<span class="bp">self</span><span class="o">=</span><span class="bp">self</span><span class="p">,</span> <span class="n">roles</span><span class="o">=</span><span class="s">&#39;, &#39;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">roles</span><span class="p">))</span>
188+
<span class="k">return</span> <span class="s">&#39;&lt;ACL Entity: {acl} ({roles})&gt;&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span>
189+
<span class="n">acl</span><span class="o">=</span><span class="bp">self</span><span class="p">,</span> <span class="n">roles</span><span class="o">=</span><span class="s">&#39;, &#39;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">roles</span><span class="p">))</span>
190190

191191
<span class="k">def</span> <span class="nf">get_roles</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
192192
<span class="sd">&quot;&quot;&quot;Get the list of roles permitted by this entity.</span>

‎_modules/gcloud/storage/connection.html‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ <h1>Source code for gcloud.storage.connection</h1><div class="highlight"><pre>
9797
<span class="kn">from</span> <span class="nn">Crypto.Hash</span> <span class="kn">import</span> <span class="n">SHA256</span>
9898
<span class="kn">from</span> <span class="nn">Crypto.PublicKey</span> <span class="kn">import</span> <span class="n">RSA</span>
9999
<span class="kn">from</span> <span class="nn">Crypto.Signature</span> <span class="kn">import</span> <span class="n">PKCS1_v1_5</span>
100-
<span class="kn">from</span> <span class="nn">OpenSSL</span> <span class="kn">import</span> <span class="n">crypto</span>
101100
<span class="kn">from</span> <span class="nn">oauth2client</span> <span class="kn">import</span> <span class="n">client</span>
101+
<span class="kn">from</span> <span class="nn">oauth2client</span> <span class="kn">import</span> <span class="n">crypt</span>
102102
<span class="kn">from</span> <span class="nn">oauth2client</span> <span class="kn">import</span> <span class="n">service_account</span>
103103
<span class="kn">import</span> <span class="nn">pytz</span>
104104

@@ -131,11 +131,8 @@ <h1>Source code for gcloud.storage.connection</h1><div class="highlight"><pre>
131131
<span class="sd"> &quot;&quot;&quot;</span>
132132
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">credentials</span><span class="p">,</span> <span class="n">client</span><span class="o">.</span><span class="n">SignedJwtAssertionCredentials</span><span class="p">):</span>
133133
<span class="c"># Take our PKCS12 (.p12) key and make it into a RSA key we can use.</span>
134-
<span class="n">pkcs12</span> <span class="o">=</span> <span class="n">crypto</span><span class="o">.</span><span class="n">load_pkcs12</span><span class="p">(</span>
135-
<span class="n">base64</span><span class="o">.</span><span class="n">b64decode</span><span class="p">(</span><span class="n">credentials</span><span class="o">.</span><span class="n">private_key</span><span class="p">),</span>
136-
<span class="s">&#39;notasecret&#39;</span><span class="p">)</span>
137-
<span class="n">pem_text</span> <span class="o">=</span> <span class="n">crypto</span><span class="o">.</span><span class="n">dump_privatekey</span><span class="p">(</span>
138-
<span class="n">crypto</span><span class="o">.</span><span class="n">FILETYPE_PEM</span><span class="p">,</span> <span class="n">pkcs12</span><span class="o">.</span><span class="n">get_privatekey</span><span class="p">())</span>
134+
<span class="n">pem_text</span> <span class="o">=</span> <span class="n">crypt</span><span class="o">.</span><span class="n">pkcs12_key_as_pem</span><span class="p">(</span><span class="n">credentials</span><span class="o">.</span><span class="n">private_key</span><span class="p">,</span>
135+
<span class="n">credentials</span><span class="o">.</span><span class="n">private_key_password</span><span class="p">)</span>
139136
<span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">credentials</span><span class="p">,</span> <span class="n">service_account</span><span class="o">.</span><span class="n">_ServiceAccountCredentials</span><span class="p">):</span>
140137
<span class="n">pem_text</span> <span class="o">=</span> <span class="n">credentials</span><span class="o">.</span><span class="n">_private_key_pkcs8_text</span>
141138
<span class="k">else</span><span class="p">:</span>

‎datastore-queries.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ <h1 class="page-title">Python</h1>
132132
</table>
133133
<dl class="attribute">
134134
<dt id="gcloud.datastore.query.Query.OPERATORS">
135-
<tt class="descname">OPERATORS</tt><em class="property"> = {'=': 5, '&gt;=': 4, '&lt;': 1, '&gt;': 3, '&lt;=': 2}</em><a class="headerlink" href="#gcloud.datastore.query.Query.OPERATORS" title="Permalink to this definition">#</a></dt>
135+
<tt class="descname">OPERATORS</tt><em class="property"> = {'=': 5, '&lt;': 1, '&gt;': 3, '&lt;=': 2, '&gt;=': 4}</em><a class="headerlink" href="#gcloud.datastore.query.Query.OPERATORS" title="Permalink to this definition">#</a></dt>
136136
<dd><p>Mapping of operator strings and their protobuf equivalents.</p>
137137
</dd></dl>
138138

‎objects.inv‎

11 Bytes
Binary file not shown.

‎searchindex.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎storage-buckets.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h1 class="page-title">Python</h1>
9494
</table>
9595
<dl class="attribute">
9696
<dt id="gcloud.storage.bucket.Bucket.CUSTOM_PROPERTY_ACCESSORS">
97-
<tt class="descname">CUSTOM_PROPERTY_ACCESSORS</tt><em class="property"> = {'location': 'location', 'storageClass': 'storage_class', 'acl': 'acl', 'defaultObjectAcl': 'get_default_object_acl()', 'etag': 'etag', 'id': 'id', 'timeCreated': 'time_created', 'cors': 'get_cors()', 'versioning': 'versioning_enabled', 'metageneration': 'metageneration', 'lifecycle': 'get_lifecycle()', 'name': 'name', 'logging': 'get_logging()', 'projectNumber': 'project_number', 'selfLink': 'self_link', 'owner': 'owner'}</em><a class="headerlink" href="#gcloud.storage.bucket.Bucket.CUSTOM_PROPERTY_ACCESSORS" title="Permalink to this definition">#</a></dt>
97+
<tt class="descname">CUSTOM_PROPERTY_ACCESSORS</tt><em class="property"> = {'metageneration': 'metageneration', 'cors': 'get_cors()', 'logging': 'get_logging()', 'location': 'location', 'defaultObjectAcl': 'get_default_object_acl()', 'timeCreated': 'time_created', 'acl': 'acl', 'lifecycle': 'get_lifecycle()', 'selfLink': 'self_link', 'name': 'name', 'versioning': 'versioning_enabled', 'etag': 'etag', 'id': 'id', 'owner': 'owner', 'projectNumber': 'project_number', 'storageClass': 'storage_class'}</em><a class="headerlink" href="#gcloud.storage.bucket.Bucket.CUSTOM_PROPERTY_ACCESSORS" title="Permalink to this definition">#</a></dt>
9898
<dd><p>Map field name -&gt; accessor for fields w/ custom accessors.</p>
9999
</dd></dl>
100100

‎storage-keys.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h1 class="page-title">Python</h1>
104104

105105
<dl class="attribute">
106106
<dt id="gcloud.storage.key.Key.CUSTOM_PROPERTY_ACCESSORS">
107-
<tt class="descname">CUSTOM_PROPERTY_ACCESSORS</tt><em class="property"> = {'componentCount': 'component_count', 'storageClass': 'storage_class', 'acl': 'acl', 'generation': 'generation', 'etag': 'etag', 'id': 'id', 'contentDisposition': 'content_disposition', 'size': 'size', 'updated': 'updated', 'metageneration': 'metageneration', 'contentType': 'content_type', 'contentEncoding': 'content_encoding', 'cacheControl': 'cache_control', 'name': 'name', 'mediaLink': 'media_link', 'selfLink': 'self_link', 'owner': 'owner', 'contentLanguage': 'content_language', 'timeDeleted': 'time_deleted'}</em><a class="headerlink" href="#gcloud.storage.key.Key.CUSTOM_PROPERTY_ACCESSORS" title="Permalink to this definition">#</a></dt>
107+
<tt class="descname">CUSTOM_PROPERTY_ACCESSORS</tt><em class="property"> = {'metageneration': 'metageneration', 'storageClass': 'storage_class', 'contentDisposition': 'content_disposition', 'mediaLink': 'media_link', 'contentLanguage': 'content_language', 'cacheControl': 'cache_control', 'selfLink': 'self_link', 'componentCount': 'component_count', 'acl': 'acl', 'contentType': 'content_type', 'updated': 'updated', 'name': 'name', 'etag': 'etag', 'id': 'id', 'owner': 'owner', 'generation': 'generation', 'contentEncoding': 'content_encoding', 'size': 'size', 'timeDeleted': 'time_deleted'}</em><a class="headerlink" href="#gcloud.storage.key.Key.CUSTOM_PROPERTY_ACCESSORS" title="Permalink to this definition">#</a></dt>
108108
<dd><p>Map field name -&gt; accessor for fields w/ custom accessors.</p>
109109
</dd></dl>
110110

0 commit comments

Comments
 (0)