Skip to content

Commit

Permalink
Doc fixes, View can now take Bundles and Treants.
Browse files Browse the repository at this point in the history
The Tree for a Treant is what gets added to the View.
  • Loading branch information
dotsdl committed Mar 17, 2016
1 parent 1dce483 commit 1b5a4c4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ The datreant namespace
packages. These packages are all dependent on a central, core library, called
``datreant.core``. This documentation is for that core library.

Other packages in the ``datreant`` namespace currently include::
Other packages in the ``datreant`` namespace currently include:

`datreant.data <http://datreantdata.readthedocs.org/en/latest/>`_
- `datreant.data <http://datreantdata.readthedocs.org/en/latest/>`_


Getting datreant
Expand Down
5 changes: 4 additions & 1 deletion src/datreant/core/collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,18 @@ def add(self, *vegs):
"""
from .trees import Veg, Leaf, Tree
from .treants import Treant

outconts = list()
for veg in vegs:
if veg is None:
pass
elif isinstance(veg, (list, tuple)):
self.add(*veg)
elif isinstance(veg, View):
elif isinstance(veg, (View, Bundle)):
self.add(*list(veg))
elif isinstance(veg, Treant):
outconts.append(veg.tree)
elif isinstance(veg, Veg):
outconts.append(veg)
elif (isinstance(veg, string_types) and
Expand Down
4 changes: 0 additions & 4 deletions src/datreant/core/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ def _check_paths(self):
uuids.remove(item)

if 'relpath' in self.paths and uuids:
import pdb
pdb.set_trace()
# get uuids for which paths haven't been found
for path in self.paths['relpath']:
found = []
Expand Down Expand Up @@ -342,8 +340,6 @@ def _find_Bundle_members(self):
path = os.path.abspath(os.curdir)
prev = None
while prev != path and uuids:
import pdb
pdb.set_trace()

# if search runs over timeout, call it off
if ((time.time() - currtime) > self.timeout and
Expand Down

0 comments on commit 1b5a4c4

Please sign in to comment.