diff options
| author | German M. Bravo <german.mb@deipi.com> | 2013-10-08 12:46:16 -0700 |
|---|---|---|
| committer | German M. Bravo <german.mb@deipi.com> | 2013-10-08 12:46:16 -0700 |
| commit | 8dd389b40d8d9c099bc5ee97065526cc0daef831 (patch) | |
| tree | fd4d97689486f22a6fa96c445764d22cb2475e6a | |
| parent | a0fe176d768451f7a2dc2edcfbfee73b9a0c4e87 (diff) | |
| download | pyscss-8dd389b40d8d9c099bc5ee97065526cc0daef831.tar.gz | |
Make @mixin and @function calls more alike
| -rw-r--r-- | scss/__init__.py | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/scss/__init__.py b/scss/__init__.py index 7d8c3b0..3840be6 100644 --- a/scss/__init__.py +++ b/scss/__init__.py @@ -720,22 +720,18 @@ class Scss(object): callee_namespace, mixin, args, kwargs) _rule = SassRule( - # TODO correct? relevant? seems the function should - # consider itself as existing where it was defined, not - # called? source_file=block.parent_rule.source_file, import_key=rule.import_key, - # TODO unparsed_contents=m_codestr, - #context=m_vars, options=rule.options.copy(), - lineno=block.lineno, - # R - #ancestry=R.ancestry, - #extends_selectors=R.extends_selectors, + properties=rule.properties, + extends_selectors=rule.extends_selectors, + ancestry=rule.ancestry, + nested=rule.nested, + lineno=block.lineno, namespace=callee_namespace, ) try: @@ -809,11 +805,21 @@ class Scss(object): "Mixin {0}".format(funct), callee_namespace, mixin, args, kwargs) - _rule = rule.copy() - _rule.unparsed_contents = m_codestr - _rule.namespace = callee_namespace - _rule.source_file = block.parent_rule.source_file - _rule.lineno = block.lineno + _rule = SassRule( + source_file=block.parent_rule.source_file, + import_key=rule.import_key, + + unparsed_contents=m_codestr, + 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 self.manage_children(_rule, scope) |