[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/buildout. fix for annotate broken tests on Windows
Godefroid Chapelle
gotcha at bubblenet.be
Fri Jul 24 09:16:49 EDT 2009
Log message for revision 102240:
fix for annotate broken tests on Windows
Changed:
U zc.buildout/trunk/src/zc/buildout/buildout.py
U zc.buildout/trunk/src/zc/buildout/buildout.txt
-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py 2009-07-24 13:16:15 UTC (rev 102239)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py 2009-07-24 13:16:48 UTC (rev 102240)
@@ -90,13 +90,21 @@
keys = data[section].keys()
keys.sort()
for key in keys:
- value, files = data[section][key]
- print "%s=%s" % (key, value)
- for file in files.split():
- print " " + file
+ value, notes = data[section][key]
+ keyvalue = "%s= %s" % (key, value)
+ print keyvalue
+ line = ' '
+ for note in notes.split():
+ if note == '[+]':
+ line = '+= '
+ elif note == '[-]':
+ line = '-= '
+ else:
+ print line, note
+ line = ' '
print
- print
+
def _unannotate_section(section):
for key in section:
value, note = section[key]
@@ -1323,14 +1331,14 @@
if k.endswith('+'):
key = k.rstrip(' +')
v1, note1 = s1.get(key, ("", ""))
- newnote = ' +'.join((note1, note2)).strip()
+ newnote = ' [+] '.join((note1, note2)).strip()
s2[key] = "\n".join((v1).split('\n') +
v2.split('\n')), newnote
del s2[k]
elif k.endswith('-'):
key = k.rstrip(' -')
v1, note1 = s1.get(key, ("", ""))
- newnote = ' -'.join((note1, note2)).strip()
+ newnote = ' [-] '.join((note1, note2)).strip()
s2[key] = ("\n".join(
[v for v in v1.split('\n')
if v not in v2.split('\n')]), newnote)
Modified: zc.buildout/trunk/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.txt 2009-07-24 13:16:15 UTC (rev 102239)
+++ zc.buildout/trunk/src/zc/buildout/buildout.txt 2009-07-24 13:16:48 UTC (rev 102240)
@@ -722,38 +722,37 @@
==================
<BLANKLINE>
[buildout]
- bin-directory=bin
+ bin-directory= bin
DEFAULT_VALUE
- develop=recipes
- .../_TEST_/sample-buildout/buildout.cfg
- develop-eggs-directory=develop-eggs
+ develop= recipes
+ /sample-buildout/buildout.cfg
+ develop-eggs-directory= develop-eggs
DEFAULT_VALUE
- directory=.../_TEST_/sample-buildout
+ directory= /sample-buildout
COMPUTED_VALUE
- eggs-directory=eggs
+ eggs-directory= eggs
DEFAULT_VALUE
- executable=...
+ executable= ...
DEFAULT_VALUE
- installed=.installed.cfg
+ installed= .installed.cfg
DEFAULT_VALUE
- log-format=
+ log-format=
DEFAULT_VALUE
- log-level=INFO
+ log-level= INFO
DEFAULT_VALUE
- parts=data-dir
- .../_TEST_/sample-buildout/buildout.cfg
- parts-directory=parts
+ parts= data-dir
+ /sample-buildout/buildout.cfg
+ parts-directory= parts
DEFAULT_VALUE
- python=buildout
+ python= buildout
DEFAULT_VALUE
<BLANKLINE>
[data-dir]
- path=foo bins
- .../_TEST_/sample-buildout/buildout.cfg
- recipe=recipes:mkdir
- .../_TEST_/sample-buildout/buildout.cfg
+ path= foo bins
+ /sample-buildout/buildout.cfg
+ recipe= recipes:mkdir
+ /sample-buildout/buildout.cfg
<BLANKLINE>
- <BLANKLINE>
Variable substitutions
----------------------
@@ -1083,34 +1082,34 @@
...
<BLANKLINE>
[part1]
- option=a1 a2
+ option= a1 a2
a3 a4
a5
- .../_TEST_/sample-buildout/base.cfg
- +.../_TEST_/sample-buildout/extension1.cfg
- +.../_TEST_/sample-buildout/extension2.cfg
- recipe=
- .../_TEST_/sample-buildout/base.cfg
+ /sample-buildout/base.cfg
+ += /sample-buildout/extension1.cfg
+ += /sample-buildout/extension2.cfg
+ recipe=
+ /sample-buildout/base.cfg
<BLANKLINE>
[part2]
- option=b1 b2 b3 b4
- .../_TEST_/sample-buildout/base.cfg
- -.../_TEST_/sample-buildout/extension1.cfg
- -.../_TEST_/sample-buildout/extension2.cfg
- recipe=
- .../_TEST_/sample-buildout/base.cfg
+ option= b1 b2 b3 b4
+ /sample-buildout/base.cfg
+ -= /sample-buildout/extension1.cfg
+ -= /sample-buildout/extension2.cfg
+ recipe=
+ /sample-buildout/base.cfg
<BLANKLINE>
[part3]
- option=c1 c2
+ option= c1 c2
c3 c4 c5
- .../_TEST_/sample-buildout/base.cfg
- +.../_TEST_/sample-buildout/extension1.cfg
- recipe=
- .../_TEST_/sample-buildout/base.cfg
+ /sample-buildout/base.cfg
+ += /sample-buildout/extension1.cfg
+ recipe=
+ /sample-buildout/base.cfg
<BLANKLINE>
[part4]
- option=h1 h2
- .../_TEST_/sample-buildout/extension1.cfg
+ option= h1 h2
+ /sample-buildout/extension1.cfg
...
Cleanup.
More information about the Checkins
mailing list