diff --git a/docs/api.rst b/docs/api.rst index cdb05638..ee7eb041 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -115,7 +115,7 @@ To access the current session you can use the :class:`session` object: .. class:: session The session object works pretty much like an ordinary dict, with the - difference that it keeps track on modifications. + difference that it keeps track of modifications. This is a proxy. See :ref:`notes-on-proxies` for more information. diff --git a/docs/patterns/fileuploads.rst b/docs/patterns/fileuploads.rst index fef92c57..d3b16643 100644 --- a/docs/patterns/fileuploads.rst +++ b/docs/patterns/fileuploads.rst @@ -25,7 +25,7 @@ bootstrapping code for our application:: from werkzeug.utils import secure_filename UPLOAD_FOLDER = '/path/to/the/uploads' - ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif']) + ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'} app = Flask(__name__) app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER diff --git a/flask/__init__.py b/flask/__init__.py index 6b7a8d00..ece0283a 100644 --- a/flask/__init__.py +++ b/flask/__init__.py @@ -34,9 +34,5 @@ from .signals import (signals_available, template_rendered, request_started, appcontext_tearing_down, appcontext_pushed, appcontext_popped, message_flashed, before_render_template) -# Expose a convenient wrapper around python's builtin json module. -from .json import jsonify - -# backwards compat, goes away in 1.0 -from .sessions import SecureCookieSession as Session -json_available = True +# Expose a convenient wrapper around json module. +from .json import jsonify \ No newline at end of file