Skip to content

Fix #19, Make the import compatible with pyScss version 1.3 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix #19, Make the import compatible with pyScss version 1.3 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ python:
env:
- DJANGO_PACKAGE='Django>=1.5,<1.6'
- DJANGO_PACKAGE='Django>=1.6,<1.7'
- PYSCSS_PACKAGE='PyScss>=1.2,<1.3'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @deshipu,

I think the syntax for this is different unfortunately. Some of the environments will miss be installed without Django.

- PYSCSS_PACKAGE='PyScss>=1.3'
matrix:
include:
- python: "2.6"
Expand All @@ -14,6 +16,7 @@ matrix:
env: DJANGO_PACKAGE='Django>=1.4,<1.5'
install:
- pip install -q $DJANGO_PACKAGE --use-mirrors
- pip install -q $PYSCSS_PACKAGE --use-mirrors
- pip install --use-mirrors .
- pip install coveralls
script:
Expand Down
12 changes: 9 additions & 3 deletions django_pyscss/scss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.conf import settings

from scss import (
Scss, dequote, log, SourceFile, SassRule, config,
)
from scss import Scss, log, config
from scss.util import dequote
try:
# For pyscss 1.3.x.
from scss.source import SourceFile
except ImportError:
# For pyscss 1.2.x.
from scss import SourceFile
from scss.rule import SassRule

from django_pyscss.utils import find_all_files

Expand Down