Merge branch 'master' of github.com:mitsuhiko/flask

docs/_themes

@@ -1 +0,0 @@
-Subproject commit 3d964b660442e23faedf801caed6e3c7bd42d5c9

docs/foreword.rst

@@ -40,8 +40,8 @@ was implemented in Flask itself.  There are currently extensions for
 object relational mappers, form validation, upload handling, various open
 authentication technologies and more.
 
-However Flask is not much code and built in a very solid foundation and
-with that very easy to adapt for large applications.  If you are
+However Flask is not much code and it is built on a very solid foundation
+and with that it is very easy to adapt for large applications.  If you are
 interested in that, check out the :ref:`becomingbig` chapter.
 
 If you are curious about the Flask design principles, head over to the

docs/styleguide.rst

@@ -31,7 +31,7 @@ Continuing long statements:
                  .order_by(MyModel.name.desc()) \
                  .limit(10)
 
-  If you break in a statement with parentheses or brances, align to the
+  If you break in a statement with parentheses or braces, align to the
   braces::
 
     this_is_a_very_long(function_call, 'with many parameters',
@@ -105,8 +105,8 @@ Yoda statements are a nogo:
         pass
 
 Comparisons:
-  - against arbitary types: ``==`` and ``!=``
-  - against singletones with ``is`` and ``is not`` (eg: ``foo is not
+  - against arbitrary types: ``==`` and ``!=``
+  - against singletons with ``is`` and ``is not`` (eg: ``foo is not
     None``)
   - never compare something with `True` or `False` (for example never
     do ``foo == False``, do ``not foo`` instead)
@@ -125,7 +125,7 @@ Naming Conventions
 - Class names: ``CamelCase``, with acronyms kept uppercase (``HTTPWriter``
   and not ``HttpWriter``)
 - Variable names: ``lowercase_with_underscores``
-- Method and functin names: ``lowercase_with_underscores``
+- Method and function names: ``lowercase_with_underscores``
 - Constants: ``UPPERCASE_WITH_UNDERSCORES``
 - precompiled regular expressions: ``name_re``
 
@@ -151,9 +151,9 @@ Docstrings
 Docstring conventions:
   All docstrings are formatted with reStructuredText as understood by
   Sphinx.  Depending on the number of lines in the docstring, they are
-  layed out differently.  If it's just one line, the closing tripple
+  layed out differently.  If it's just one line, the closing triple
   quote is on the same line as the opening, otherwise the text is on
-  the same line as the opening quote and the tripple quote that closes
+  the same line as the opening quote and the triple quote that closes
   the string on its own line::
 
     def foo():

tests/flaskext_test.py

@@ -209,7 +209,7 @@ downloadcache=%(cache)s
 
 
 def create_tox_ini(checkout_path, interpreters, flask_dep):
-    tox_path = os.path.join(checkout_path, 'tox.ini')
+    tox_path = os.path.join(checkout_path, 'tox-flask-test.ini')
     if not os.path.exists(tox_path):
         with open(tox_path, 'w') as f:
             f.write(tox_template % {
@@ -217,6 +217,7 @@ def create_tox_ini(checkout_path, interpreters, flask_dep):
                 'cache':    tdir,
                 'deps':     flask_dep
             })
+    return tox_path
 
 
 def iter_extensions(only_approved=True):
@@ -244,12 +245,9 @@ def test_extension(name, interpreters, flask_dep):
     # if there is a tox.ini, remove it, it will cause troubles
     # for us.  Remove it if present, we are running tox ourselves
     # afterall.
-    toxini = os.path.join(checkout_path, 'tox.ini')
-    if os.path.isfile(toxini):
-        os.remove(toxini)
 
     create_tox_ini(checkout_path, interpreters, flask_dep)
-    rv = subprocess.call(['tox'], cwd=checkout_path)
+    rv = subprocess.call(['tox', '-c', 'tox-flask-test.ini'], cwd=checkout_path)
     return TestResult(name, checkout_path, rv, interpreters)