diff --git a/conftest.py b/conftest.py index 535bb681..17fe7679 100644 --- a/conftest.py +++ b/conftest.py @@ -4,7 +4,6 @@ from __future__ import print_function import logging -from pathlib import Path import pytest @@ -17,6 +16,7 @@ from scss.extension.extra import ExtraExtension from scss.extension.fonts import FontsExtension from scss.extension.compass import CompassExtension +from scss.util import Path try: import fontforge diff --git a/scss/compiler.py b/scss/compiler.py index 7b8dbd16..0ed22dfc 100644 --- a/scss/compiler.py +++ b/scss/compiler.py @@ -6,7 +6,7 @@ from collections import defaultdict from enum import Enum import logging -from pathlib import Path +from .util import Path import re import sys import warnings diff --git a/scss/extension/core.py b/scss/extension/core.py index 5c7e7653..c450d77b 100644 --- a/scss/extension/core.py +++ b/scss/extension/core.py @@ -7,7 +7,7 @@ from itertools import product import math import os.path -from pathlib import PurePosixPath +from ..util import PurePosixPath from six.moves import xrange diff --git a/scss/legacy.py b/scss/legacy.py index ec4fd72c..2248b500 100644 --- a/scss/legacy.py +++ b/scss/legacy.py @@ -4,7 +4,7 @@ from __future__ import division import os -from pathlib import Path +from .util import Path from collections import namedtuple import six diff --git a/scss/source.py b/scss/source.py index bb1f1ec8..de053c9d 100644 --- a/scss/source.py +++ b/scss/source.py @@ -5,7 +5,7 @@ import hashlib import logging -from pathlib import Path +from .util import Path import re import six diff --git a/scss/util.py b/scss/util.py index c229438b..96f78502 100644 --- a/scss/util.py +++ b/scss/util.py @@ -14,6 +14,11 @@ from scss import config +try: + from pathlib2 import Path, PurePosixPath +except ImportError: + from pathlib import Path, PurePosixPath + BASE_DIR = os.path.dirname(__file__) diff --git a/setup.py b/setup.py index 7e7044d1..ed108631 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ install_requires = ['six'] if sys.version_info < (3, 4): install_requires.append('enum34') - install_requires.append('pathlib') + install_requires.append('pathlib2') if sys.version_info < (2, 7): install_requires.append('ordereddict')