diff options
| author | German M. Bravo <german.mb@deipi.com> | 2013-10-08 12:53:55 -0700 |
|---|---|---|
| committer | German M. Bravo <german.mb@deipi.com> | 2013-10-08 12:53:55 -0700 |
| commit | 552d0452d351c3e628d984d0cb02cad646773842 (patch) | |
| tree | f603504811d0aa28be1b23855ca464cf3c0dc873 | |
| parent | 8dd389b40d8d9c099bc5ee97065526cc0daef831 (diff) | |
| download | pyscss-552d0452d351c3e628d984d0cb02cad646773842.tar.gz | |
Re-ordered SassRule() instantiation
| -rw-r--r-- | scss/__init__.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/scss/__init__.py b/scss/__init__.py index 3840be6..be98d1f 100644 --- a/scss/__init__.py +++ b/scss/__init__.py @@ -721,18 +721,17 @@ class Scss(object): _rule = SassRule( source_file=block.parent_rule.source_file, - import_key=rule.import_key, - unparsed_contents=m_codestr, - options=rule.options.copy(), + lineno=block.lineno, + namespace=callee_namespace, + # rule + import_key=rule.import_key, + options=rule.options, properties=rule.properties, extends_selectors=rule.extends_selectors, ancestry=rule.ancestry, nested=rule.nested, - - lineno=block.lineno, - namespace=callee_namespace, ) try: self.manage_children(_rule, scope) @@ -761,7 +760,6 @@ class Scss(object): break if not new_params: add(funct, 0, mixin) - # rule.namespace._mutable = False # <- mixin namespace should be immutable from now on @print_timing(10) def _do_include(self, rule, scope, block): @@ -807,18 +805,17 @@ class Scss(object): _rule = SassRule( source_file=block.parent_rule.source_file, - import_key=rule.import_key, - unparsed_contents=m_codestr, - options=rule.options, + lineno=block.lineno, + namespace=callee_namespace, + # rule + import_key=rule.import_key, + options=rule.options, properties=rule.properties, extends_selectors=rule.extends_selectors, ancestry=rule.ancestry, nested=rule.nested, - - lineno=block.lineno, - namespace=callee_namespace, ) _rule.options['@content'] = block.unparsed_contents |