[Checkins] SVN: zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/tests.py normalize text indentation, favoring not indenting expository text. fix a few typos and spacing problems.
Gary Poster
gary.poster at canonical.com
Thu Sep 24 14:09:44 EDT 2009
Log message for revision 104500:
normalize text indentation, favoring not indenting expository text. fix a few typos and spacing problems.
Changed:
U zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/tests.py
-=-
Modified: zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/tests.py 2009-09-24 18:06:37 UTC (rev 104499)
+++ zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/tests.py 2009-09-24 18:09:43 UTC (rev 104500)
@@ -260,18 +260,18 @@
def show_who_requires_when_there_is_a_conflict():
"""
- It's a pain when we require eggs that have requirements that are
- incompatible. We want the error we get to tell us what is missing.
+It's a pain when we require eggs that have requirements that are
+incompatible. We want the error we get to tell us what is missing.
- Let's make a few develop distros, some of which have incompatible
- requirements.
+Let's make a few develop distros, some of which have incompatible
+requirements.
>>> make_dist_that_requires(sample_buildout, 'sampley',
... ['demoneeded ==1.0'])
>>> make_dist_that_requires(sample_buildout, 'samplez',
... ['demoneeded ==1.1'])
- Now, let's create a buildout that requires y and z:
+Now, let's create a buildout that requires y and z:
>>> write('buildout.cfg',
... '''
@@ -298,8 +298,8 @@
We already have: demoneeded 1.1
but sampley 1 requires 'demoneeded==1.0'.
- Here, we see that sampley required an older version of demoneeded.
- What if we hadn't required sampley ourselves:
+Here, we see that sampley required an older version of demoneeded. What
+if we hadn't required sampley ourselves:
>>> make_dist_that_requires(sample_buildout, 'samplea', ['sampleb'])
>>> make_dist_that_requires(sample_buildout, 'sampleb',
@@ -317,7 +317,7 @@
... samplez
... ''' % globals())
-If we use the verbose switch, we can see where requirements are comning from:
+If we use the verbose switch, we can see where requirements are coming from:
>>> print system(buildout+' -v'), # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'.
@@ -351,10 +351,9 @@
def show_who_requires_missing_distributions():
"""
- When working with a lot of eggs, which require eggs recursively,
- it can be hard to tell why we're requireing things we can't find.
- Fortunately, buildout will tell us who's asking for something that
- we can't find.
+When working with a lot of eggs, which require eggs recursively, it can
+be hard to tell why we're requiring things we can't find. Fortunately,
+buildout will tell us who's asking for something that we can't find.
>>> make_dist_that_requires(sample_buildout, 'sampley', ['demoneeded'])
>>> make_dist_that_requires(sample_buildout, 'samplea', ['sampleb'])
@@ -387,8 +386,8 @@
def test_comparing_saved_options_with_funny_characters():
"""
- If an option has newlines, extra/odd spaces or a %, we need to make
- sure the comparison with the saved value works correctly.
+If an option has newlines, extra/odd spaces or a %, we need to make sure
+the comparison with the saved value works correctly.
>>> mkdir(sample_buildout, 'recipes')
>>> write(sample_buildout, 'recipes', 'debug.py',
@@ -2158,7 +2157,7 @@
"""
This test tests several permutations:
-Using different version numbers to work around zip impporter cache problems. :(
+Using different version numbers to work around zip importer cache problems. :(
- With prefer final:
@@ -2980,7 +2979,7 @@
'-q develop -mxN -d "/sample-buildout/develop-eggs'),
'-q develop -mxN -d /sample-buildout/develop-eggs'
),
- (re.compile(r'^[*]...'), '...'),
+ (re.compile(r'^[*]...'), '...'),
]),
),
zc.buildout.testselectingpython.test_suite(),
More information about the checkins
mailing list