Merge 5a46f98 into b08f892

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

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

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
 

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

scss/source.py

@@ -5,7 +5,7 @@
 
 import hashlib
 import logging
-from pathlib import Path
+from .util import Path
 import re
 
 import six

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__)
 
 

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')