Skip to content

Commit

Permalink
Merge 0d0da92 into 42b7e52
Browse files Browse the repository at this point in the history
  • Loading branch information
asergi committed May 11, 2016
2 parents 42b7e52 + 0d0da92 commit e7353d9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 6 deletions.
5 changes: 4 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
from __future__ import print_function

import logging
from pathlib import Path
try:
from pathlib import Path
except ImportError:
from pathlib2 import Path

import pytest

Expand Down
5 changes: 4 additions & 1 deletion scss/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
from collections import defaultdict
from enum import Enum
import logging
from pathlib import Path
try:
from pathlib import Path
except ImportError:
from pathlib2 import Path
import re
import sys
import warnings
Expand Down
5 changes: 4 additions & 1 deletion scss/extension/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
from itertools import product
import math
import os.path
from pathlib import PurePosixPath
try:
from pathlib import PurePosixPath
except ImportError:
from pathlib2 import PurePosixPath

from six.moves import xrange

Expand Down
5 changes: 4 additions & 1 deletion scss/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
from __future__ import division

import os
from pathlib import Path
try:
from pathlib import Path
except ImportError:
from pathlib2 import Path
from collections import namedtuple

import six
Expand Down
5 changes: 4 additions & 1 deletion scss/source.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

import hashlib
import logging
from pathlib import Path
try:
from pathlib import Path
except ImportError:
from pathlib2 import Path
import re

import six
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down

0 comments on commit e7353d9

Please sign in to comment.