Skip to content

Commit

Permalink
Merge pull request #69 from datreant/dependency-pathlib2
Browse files Browse the repository at this point in the history
We now use pathlib2 as a dependency instead of pathlib.
  • Loading branch information
dotsdl committed Jun 24, 2016
2 parents 7a8b218 + 734773c commit 0ca597e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ Fixes

Changes

* Switched from ``pathlib`` to ``pathlib2`` as a dependency for backwards
compatibility with python < 3.4.



Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
scripts=[],
license='BSD',
long_description=open('README.rst').read(),
install_requires=['asciitree', 'pathlib', 'scandir', 'six', 'fuzzywuzzy']
install_requires=['asciitree', 'pathlib2', 'scandir', 'six', 'fuzzywuzzy']
)
4 changes: 2 additions & 2 deletions src/datreant/core/treants.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import functools
import six
from uuid import uuid4
from pathlib import Path
from pathlib2 import Path

from . import limbs
from . import filesystem
Expand Down Expand Up @@ -316,7 +316,7 @@ def location(self, value):

@property
def path(self):
"""Treant directory as a :class:`pathlib.Path`.
"""Treant directory as a :class:`pathlib2.Path`.
"""
return Path(self._backend.get_location())
Expand Down
4 changes: 2 additions & 2 deletions src/datreant/core/trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from six import string_types

import scandir
from pathlib import Path
from pathlib2 import Path
from asciitree import LeftAligned

from .util import makedirs
Expand Down Expand Up @@ -53,7 +53,7 @@ def exists(self):

@property
def path(self):
"""Filesystem path as a :class:`pathlib.Path`.
"""Filesystem path as a :class:`pathlib2.Path`.
"""
return self._path
Expand Down

0 comments on commit 0ca597e

Please sign in to comment.