Commit e5ef240b authored by Antoine Catton's avatar Antoine Catton Committed by Łukasz Nowak

Revert "Escape $$ character to $."

This reverts commit ef1a217bbb2b0abd21a630e6154ff8dc5e968caa.
parent 818af000
...@@ -1295,7 +1295,6 @@ class Options(UserDict.DictMixin): ...@@ -1295,7 +1295,6 @@ class Options(UserDict.DictMixin):
self._raw = data self._raw = data
self._cooked = {} self._cooked = {}
self._data = {} self._data = {}
self._non_escaped_data = {}
def _initialize(self): def _initialize(self):
name = self.name name = self.name
...@@ -1357,17 +1356,11 @@ class Options(UserDict.DictMixin): ...@@ -1357,17 +1356,11 @@ class Options(UserDict.DictMixin):
v = '$$'.join([self._sub(s, seen) for s in v.split('$$')]) v = '$$'.join([self._sub(s, seen) for s in v.split('$$')])
self._cooked[option] = v self._cooked[option] = v
def get(self, option, default=None, seen=None, escaped=True): def get(self, option, default=None, seen=None):
if escaped: try:
try: return self._data[option]
return self._data[option] except KeyError:
except KeyError: pass
pass
else:
try:
return self._non_escaped_data[option]
except KeyError:
pass
v = self._cooked.get(option) v = self._cooked.get(option)
if v is None: if v is None:
...@@ -1390,13 +1383,8 @@ class Options(UserDict.DictMixin): ...@@ -1390,13 +1383,8 @@ class Options(UserDict.DictMixin):
v = '$$'.join([self._sub(s, seen) for s in v.split('$$')]) v = '$$'.join([self._sub(s, seen) for s in v.split('$$')])
seen.pop() seen.pop()
self._non_escaped_data[option] = v
v = v.replace('$${', '${')
self._data[option] = v self._data[option] = v
if escaped: return v
return self._data[option]
else:
return self._non_escaped_data[option]
_template_split = re.compile('([$]{[^}]*})').split _template_split = re.compile('([$]{[^}]*})').split
_simple = re.compile('[-a-zA-Z0-9 ._]+$').match _simple = re.compile('[-a-zA-Z0-9 ._]+$').match
...@@ -1429,8 +1417,7 @@ class Options(UserDict.DictMixin): ...@@ -1429,8 +1417,7 @@ class Options(UserDict.DictMixin):
section, option = s section, option = s
if not section: if not section:
section = self.name section = self.name
v = self.buildout[section].get(option, None, seen, v = self.buildout[section].get(option, None, seen)
escaped=False)
if v is None: if v is None:
if option == '_buildout_section_name_': if option == '_buildout_section_name_':
v = self.name v = self.name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment