Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 9c567f7c4c6a108a0234618e4788fb0581398383 2 parents d7da21d + f9271f2
Kevin McDonald sudorandom authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 docs/build/html/object.html
  2. +2 −2 object_storage/storage_object.py
4 docs/build/html/object.html
View
@@ -129,7 +129,7 @@
<dl class="method">
<dt id="object_storage.storage_object.StorageObject.is_dir">
<tt class="descname">is_dir</tt><big>(</big><big>)</big><a class="reference internal" href="_modules/object_storage/storage_object.html#StorageObject.is_dir"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#object_storage.storage_object.StorageObject.is_dir" title="Permalink to this definition">¶</a></dt>
-<dd><p>returns True if content_type is &#8216;text/directory&#8217;</p>
+<dd><p>returns True if content_type is &#8216;text/directory&#8217; or &#8216;application/directory&#8217;</p>
</dd></dl>
<dl class="method">
@@ -356,4 +356,4 @@
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.1.
</div>
</body>
-</html>
+</html>
4 object_storage/storage_object.py
View
@@ -188,8 +188,8 @@ def _formatter(res):
return self.client.make_request('GET', [self.container], params=params, formatter=_formatter)
def is_dir(self):
- """ returns True if content_type is 'text/directory' """
- return self.model.content_type == 'text/directory'
+ """ returns True if content_type is 'text/directory' or 'application/directory' """
+ return self.model.content_type in ['text/directory', 'application/directory']
def set_metadata(self, meta):
""" Sets metadata for the object
Please sign in to comment.
Something went wrong with that request. Please try again.