Merge pull request #9720 from vlajos/typofixes-vlajos-20141204

typofixes - https://github.com/vlajos/misspell_fixer
This commit is contained in:
Michael DeHaan
2014-12-08 14:00:52 -08:00
24 changed files with 31 additions and 31 deletions

View File

@@ -329,5 +329,5 @@ class TestModuleUtilsBasicHelpers(unittest.TestCase):
# The overzealous-ness here may lead to us changing the algorithm in
# the future. We could make it consume less of the data (with the
# possiblity of leaving partial passwords exposed) and encourage
# possibility of leaving partial passwords exposed) and encourage
# people to use no_log instead of relying on this obfuscation.

View File

@@ -717,7 +717,7 @@ class TestUtils(unittest.TestCase):
# jinja2 loop blocks with lots of complexity
_test_combo(
# in memory of neighbors cat
# we preserve line breaks unless a line continuation character preceeds them
# we preserve line breaks unless a line continuation character precedes them
'a {% if x %} y {%else %} {{meow}} {% endif %} "cookie\nchip" \\\ndone\nand done',
['a', '{% if x %}', 'y', '{%else %}', '{{meow}}', '{% endif %}', '"cookie\nchip"', 'done\n', 'and', 'done']
)