Permalink
Browse files

Fix a doc oversight, and revert 5876a8f.

  • Loading branch information...
1 parent 5876a8f commit f014ce29a7cd5a3ccfabd61e7d66e017ed958e25 @florentx florentx committed with mitsuhiko Apr 20, 2010
Showing with 3 additions and 2 deletions.
  1. +2 −2 docs/testing.rst
  2. +1 −0 flask.py
View
4 docs/testing.rst
@@ -68,15 +68,15 @@ to create a temporary database and initialize it. The
:func:`~tempfile.mkstemp` function does two things for us: it returns a
low-level file handle and a random file name, the latter we use as
database name. We just have to keep the `db_fd` around so that we can use
-the :func:`os.close` function to close the function.
+the :func:`os.close` function to close the file.
If we now run that testsuite, we should see the following output::
$ python flaskr_tests.py
----------------------------------------------------------------------
Ran 0 tests in 0.000s
-
+
OK
Even though it did not run any tests, we already know that our flaskr
View
1 flask.py
@@ -270,6 +270,7 @@ def _get_package_path(name):
# figure out if simplejson escapes slashes. This behaviour was changed
# from one version to another without reason.
if not json_available or '\\/' not in json.dumps('/'):
+
def _tojson_filter(*args, **kwargs):
if __debug__:
_assert_have_json()

0 comments on commit f014ce2

Please sign in to comment.