Merge remote-tracking branch 'upstream/master'

softlayer · Oct 19, 2012 · 9c567f7 · 9c567f7
2 parents d7da21d + f9271f2
commit 9c567f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/build/html/object.html b/docs/build/html/object.html
@@ -129,7 +129,7 @@ <h1>StorageObject<a class="headerlink" href="#storageobject" title="Permalink to
 <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 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.1.
     </div>
   </body>
-</html>
+</html>
diff --git a/object_storage/storage_object.py b/object_storage/storage_object.py
@@ -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' """
+        """ returns True if content_type is 'text/directory' or 'application/directory' """
-        return self.model.content_type == 'text/directory'
+        return self.model.content_type in ['text/directory', 'application/directory']
 
     def set_metadata(self, meta):
         """ Sets metadata for the object