scss.expression -> scss.calculator

9 files changed, 8 insertions, 8 deletions

diff --git a/scss/expression.py b/scss/calculator.py
index 39eb623..39eb623 100644
--- a/scss/expression.py
+++ b/scss/calculator.py
diff --git a/scss/compiler.py b/scss/compiler.py
index bb78a12..fb6e8a9 100644
--- a/scss/compiler.py
+++ b/scss/compiler.py
@@ -21,6 +21,7 @@ except ImportError:
 
 import six
 
+from scss.calculator import Calculator
 import scss.config as config
 from scss.cssdefs import _spaces_re
 from scss.cssdefs import _escape_chars_re
@@ -28,7 +29,6 @@ from scss.cssdefs import _prop_split_re
 from scss.errors import SassError
 from scss.errors import SassBaseError
 from scss.errors import SassImportError
-from scss.expression import Calculator
 from scss.extension import Extension
 from scss.extension.core import CoreExtension
 from scss.extension import NamespaceAdapterExtension
diff --git a/scss/legacy.py b/scss/legacy.py
index 1b7da84..367c700 100644
--- a/scss/legacy.py
+++ b/scss/legacy.py
@@ -5,9 +5,9 @@ from __future__ import division
 
 import six
 
+from scss.calculator import Calculator
 from scss.compiler import Compiler
 import scss.config as config
-from scss.expression import Calculator
 from scss.extension.bootstrap import BootstrapExtension
 from scss.extension.core import CoreExtension
 from scss.extension.compass import CompassExtension
diff --git a/scss/tests/functions/compass/test_gradients.py b/scss/tests/functions/compass/test_gradients.py
index 67f4aeb..c4bfbc8 100644
--- a/scss/tests/functions/compass/test_gradients.py
+++ b/scss/tests/functions/compass/test_gradients.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from scss.expression import Calculator
+from scss.calculator import Calculator
 from scss.extension.compass import CompassExtension
 from scss.extension.compass.gradients import linear_gradient
 from scss.types import String, List, Number, Color
diff --git a/scss/tests/functions/compass/test_helpers.py b/scss/tests/functions/compass/test_helpers.py
index 4590c9c..01bca04 100644
--- a/scss/tests/functions/compass/test_helpers.py
+++ b/scss/tests/functions/compass/test_helpers.py
@@ -15,7 +15,7 @@ from __future__ import unicode_literals
 import os
 
 from scss import config
-from scss.expression import Calculator
+from scss.calculator import Calculator
 from scss.extension.compass import CompassExtension
 
 import pytest
diff --git a/scss/tests/functions/compass/test_images.py b/scss/tests/functions/compass/test_images.py
index e804c72..a5d0312 100644
--- a/scss/tests/functions/compass/test_images.py
+++ b/scss/tests/functions/compass/test_images.py
@@ -18,7 +18,7 @@ import sys
 import pytest
 
 from scss import config
-from scss.expression import Calculator
+from scss.calculator import Calculator
 from scss.extension.compass import CompassExtension
 
 
diff --git a/scss/tests/functions/test_core.py b/scss/tests/functions/test_core.py
index 6657553..4063e52 100644
--- a/scss/tests/functions/test_core.py
+++ b/scss/tests/functions/test_core.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import unicode_literals
 
-from scss.expression import Calculator
+from scss.calculator import Calculator
 from scss.extension.core import CoreExtension
 from scss.types import Color, Number, String
 
diff --git a/scss/tests/test_expression.py b/scss/tests/test_expression.py
index 707c868..b4fce80 100644
--- a/scss/tests/test_expression.py
+++ b/scss/tests/test_expression.py
@@ -6,9 +6,9 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from scss.calculator import Calculator
 from scss.errors import SassEvaluationError
 from scss.errors import SassSyntaxError
-from scss.expression import Calculator
 from scss.extension.core import CoreExtension
 from scss.types import Color, List, Null, Number, String
 from scss.types import Function
diff --git a/scss/tool.py b/scss/tool.py
index cbfee19..915d2a1 100644
--- a/scss/tool.py
+++ b/scss/tool.py
@@ -10,10 +10,10 @@ import re
 import sys
 
 from scss import config
+from scss.calculator import Calculator
 from scss.compiler import _prop_split_re
 from scss.compiler import Compiler
 from scss.errors import SassEvaluationError
-from scss.expression import Calculator
 from scss.legacy import Scss
 from scss.legacy import _default_scss_vars
 from scss.namespace import Namespace