Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Leymonerie
slapos.buildout
Commits
e5ef240b
Commit
e5ef240b
authored
Oct 12, 2011
by
Antoine Catton
Committed by
Łukasz Nowak
Oct 12, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Escape $$ character to $."
This reverts commit
ef1a217b
.
parent
818af000
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
20 deletions
+7
-20
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+7
-20
No files found.
src/zc/buildout/buildout.py
View file @
e5ef240b
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment