Convert extra and fonts into extensions.

3 files changed, 4 insertions, 7 deletions

diff --git a/scss/tests/functions/test_core.py b/scss/tests/functions/test_core.py
index 1d7c64d..6657553 100644
--- a/scss/tests/functions/test_core.py
+++ b/scss/tests/functions/test_core.py
@@ -7,8 +7,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import unicode_literals
 
-from scss.core import CoreExtension
 from scss.expression import Calculator
+from scss.extension.core import CoreExtension
 from scss.types import Color, Number, String
 
 import pytest
diff --git a/scss/tests/functions/test_extra.py b/scss/tests/functions/test_extra.py
index 05fc616..9f4f30b 100644
--- a/scss/tests/functions/test_extra.py
+++ b/scss/tests/functions/test_extra.py
@@ -7,12 +7,9 @@ tested, rather than the parsing or type system.
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import scss.functions.extra as libextra
+import scss.extra as libextra
 from scss.types import Boolean, Color, Number
 
-import pytest
-xfail = pytest.mark.xfail
-
 
 # TODO: currently these all just call the functions and make sure they pass.
 # would be nice to check the output, though that's a little tedious.
@@ -27,7 +24,7 @@ def test_background_brushed():
 
 def test_grid_image():
     # TODO this should accept sass values only  :|
-    libextra._grid_image(5, 100, 5, 100)
+    libextra.grid_image(5, 100, 5, 100)
 
 
 def test_image_color():
diff --git a/scss/tests/test_expression.py b/scss/tests/test_expression.py
index 0c607da..199d9b7 100644
--- a/scss/tests/test_expression.py
+++ b/scss/tests/test_expression.py
@@ -4,9 +4,9 @@ contains a variety of expression-related tests.
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from scss.core import CoreExtension
 from scss.errors import SassEvaluationError
 from scss.expression import Calculator
+from scss.extension.core import CoreExtension
 from scss.rule import Namespace
 from scss.types import Color, List, Null, Number, String