openstack/deb-python-lesscpy
Code Issues Proposed changes

nested scopes

Browse Source
This commit is contained in:
jtm
2012-02-12 14:31:51 +00:00
parent c21a725c3d
commit 329e74c5be
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lesscpy/plib/block.py
View File

@@ -20,8 +20,6 @@ class Block(Process):
self._blocktype = None
self.scope = scope
self._proplist()
self.parsed['inner'] = [p for p in self._p[2]
if type(p) is type(self)]
self._pname()
if self._name.startswith('@media'):
self._blocktype = 'inner'
@@ -73,9 +71,13 @@ class Block(Process):
Multiple porperties of the same type overwrite,
so we can safely take only the last.
"""
proplist = [p for p in utility.flatten(self._p[2])
if p and type(p) != type(self)]
store = OrderedDict()
for p in proplist:
store[p.parsed['property']] = p
self.parsed['proplist'] = store.values()
self.parsed['inner'] = []
for p in utility.flatten(self._p[2]):
if not p: continue
if not p.parsed: p.parse(self.scope)
if type(p) is type(self):
self.parsed['inner'].append(p)
elif 'property' in p.parsed:
store[p.parsed['property']] = p
self.parsed['proplist'] = list(store.values())

2
lesscpy/plib/mixin.py
View File

@@ -46,7 +46,7 @@ class Mixin(Process):
if p]
self.scope = scope if scope else Scope(True)
self.scope[0]['__variables__'].update(self.stash)
prop = [copy.copy(p) for p in self.prop if p]
prop = [copy.deepcopy(p) for p in self.prop if p]
prop = utility.flatten([p.call(args, self.scope)
if type(p) is Mixin else p
for p in prop])