summaryrefslogtreecommitdiff
path: root/scss/types.py
diff options
context:
space:
mode:
authorEevee (Alex Munroe) <eevee.git@veekun.com>2014-07-12 18:29:55 -0700
committerEevee (Alex Munroe) <eevee.git@veekun.com>2014-07-12 18:29:55 -0700
commitaed2f41d3921dd93eab295273bfb3b9e5eb3391d (patch)
tree57e94cb61171fa123662fef7836819f92738efba /scss/types.py
parent7c50bb9c26e7c9988cfcdbf8ea2cd3030324bd80 (diff)
downloadpyscss-aed2f41d3921dd93eab295273bfb3b9e5eb3391d.tar.gz
Revert "Uses six.u() to allow Python 3.2 compat."
This reverts commit 65235576e1076a93c6c9ed06ba657105bea6b012.
Diffstat (limited to 'scss/types.py')
-rw-r--r--scss/types.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/scss/types.py b/scss/types.py
index 27528e2..a99ba35 100644
--- a/scss/types.py
+++ b/scss/types.py
@@ -20,7 +20,7 @@ PRECISION = 8
class Value(object):
is_null = False
- sass_type_name = six.u('unknown')
+ sass_type_name = u'unknown'
def __repr__(self):
return '<%s(%s)>' % (self.__class__.__name__, repr(self.value))
@@ -127,7 +127,7 @@ class Value(object):
class Null(Value):
is_null = True
- sass_type_name = six.u('null')
+ sass_type_name = u'null'
def __init__(self, value=None):
pass
@@ -155,7 +155,7 @@ class Null(Value):
class Undefined(Null):
- sass_type_name = six.u('undefined')
+ sass_type_name = u'undefined'
def __init__(self, value=None):
pass
@@ -204,7 +204,7 @@ class Undefined(Null):
class Boolean(Value):
- sass_type_name = six.u('bool')
+ sass_type_name = u'bool'
def __init__(self, value):
self.value = bool(value)
@@ -226,7 +226,7 @@ class Boolean(Value):
class Number(Value):
- sass_type_name = six.u('number')
+ sass_type_name = u'number'
def __init__(self, amount, unit=None, unit_numer=(), unit_denom=()):
if isinstance(amount, Number):
@@ -551,7 +551,7 @@ class List(Value):
in CSS output.
"""
- sass_type_name = six.u('list')
+ sass_type_name = u'list'
def __init__(self, iterable, separator=None, use_comma=None, is_literal=False):
if isinstance(iterable, List):
@@ -737,7 +737,7 @@ def _constrain(value, lb=0, ub=1):
class Color(Value):
- sass_type_name = six.u('color')
+ sass_type_name = u'color'
original_literal = None
def __init__(self, tokens):
@@ -980,7 +980,7 @@ class String(Value):
Otherwise, double quotes are used.
"""
- sass_type_name = six.u('string')
+ sass_type_name = u'string'
def __init__(self, value, quotes='"'):
if isinstance(value, String):
@@ -1070,7 +1070,7 @@ class Url(String):
class Map(Value):
- sass_type_name = six.u('map')
+ sass_type_name = u'map'
def __init__(self, pairs, index=None):
self.pairs = tuple(pairs)
@@ -1124,10 +1124,10 @@ def expect_type(value, types, unit=any):
if len(sass_type_names) == 1:
sass_type = sass_type_names[0]
elif len(sass_type_names) == 2:
- sass_type = six.u(' or ').join(sass_type_names)
+ sass_type = u' or '.join(sass_type_names)
else:
- sass_type = six.u(', ').join(sass_type_names[:-1])
- sass_type += six.u(', or ') + sass_type_names[-1]
+ sass_type = u', '.join(sass_type_names[:-1])
+ sass_type += u', or ' + sass_type_names[-1]
raise TypeError("Expected %s, got %r" % (sass_type, value))