playground
/
flask
mirror of https://github.com/mitsuhiko/flask.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #1303 from Parkayun/master 

Happy New Year 2015
pull/1308/head
Markus Unterwaditzer 10 years ago
parent
4fde65eb7a 33534bb4a9
commit
5b98266152
48 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      LICENSE
  2. 2
      docs/conf.py
  3. 2
      examples/flaskr/flaskr.py
  4. 2
      examples/flaskr/test_flaskr.py
  5. 2
      examples/jqueryexample/jqueryexample.py
  6. 2
      examples/minitwit/minitwit.py
  7. 2
      examples/minitwit/test_minitwit.py
  8. 2
      flask/__init__.py
  9. 2
      flask/__main__.py
  10. 2
      flask/_compat.py
  11. 2
      flask/app.py
  12. 2
      flask/blueprints.py
  13. 2
      flask/cli.py
  14. 2
      flask/config.py
  15. 2
      flask/ctx.py
  16. 2
      flask/debughelpers.py
  17. 2
      flask/ext/__init__.py
  18. 2
      flask/exthook.py
  19. 2
      flask/globals.py
  20. 2
      flask/helpers.py
  21. 2
      flask/json.py
  22. 2
      flask/logging.py
  23. 2
      flask/sessions.py
  24. 2
      flask/signals.py
  25. 2
      flask/templating.py
  26. 2
      flask/testing.py
  27. 2
      flask/views.py
  28. 2
      flask/wrappers.py
  29. 2
      scripts/flask-07-upgrade.py
  30. 2
      scripts/flaskext_compat.py
  31. 2
      scripts/flaskext_tester.py
  32. 2
      scripts/make-release.py
  33. 2
      tests/conftest.py
  34. 2
      tests/test_appctx.py
  35. 2
      tests/test_basic.py
  36. 2
      tests/test_blueprints.py
  37. 2
      tests/test_config.py
  38. 2
      tests/test_deprecations.py
  39. 2
      tests/test_ext.py
  40. 2
      tests/test_helpers.py
  41. 2
      tests/test_instance_config.py
  42. 2
      tests/test_regression.py
  43. 2
      tests/test_reqctx.py
  44. 2
      tests/test_signals.py
  45. 2
      tests/test_subclassing.py
  46. 2
      tests/test_templating.py
  47. 2
      tests/test_testing.py
  48. 2
      tests/test_views.py

2
LICENSE
Unescape View File

@ -1,4 +1,4 @@
Copyright (c) 2014 by Armin Ronacher and contributors. See AUTHORS Copyright (c) 2015 by Armin Ronacher and contributors. See AUTHORS
for more details. for more details.
Some rights reserved. Some rights reserved.

2
docs/conf.py
Unescape View File

@ -43,7 +43,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Flask' project = u'Flask'
copyright = u'2014, Armin Ronacher' copyright = u'2015, Armin Ronacher'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the

2
examples/flaskr/flaskr.py
Unescape View File

@ -6,7 +6,7 @@
A microblog example application written as Flask tutorial with A microblog example application written as Flask tutorial with
Flask and sqlite3. Flask and sqlite3.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
examples/flaskr/test_flaskr.py
Unescape View File

@ -5,7 +5,7 @@
Tests the Flaskr application. Tests the Flaskr application.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
examples/jqueryexample/jqueryexample.py
Unescape View File

@ -5,7 +5,7 @@
A simple application that shows how Flask and jQuery get along. A simple application that shows how Flask and jQuery get along.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from flask import Flask, jsonify, render_template, request from flask import Flask, jsonify, render_template, request

2
examples/minitwit/minitwit.py
Unescape View File

@ -5,7 +5,7 @@
A microblogging application written with Flask and sqlite3. A microblogging application written with Flask and sqlite3.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
examples/minitwit/test_minitwit.py
Unescape View File

@ -5,7 +5,7 @@
Tests the MiniTwit application. Tests the MiniTwit application.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import os import os

2
flask/__init__.py
Unescape View File

@ -6,7 +6,7 @@
A microframework based on Werkzeug. It's extensively documented A microframework based on Werkzeug. It's extensively documented
and follows best practice patterns. and follows best practice patterns.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/__main__.py
Unescape View File

@ -5,7 +5,7 @@
Alias for flask.run for the command line. Alias for flask.run for the command line.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/_compat.py
Unescape View File

@ -7,7 +7,7 @@
version of six so we don't have to depend on a specific version version of six so we don't have to depend on a specific version
of it. of it.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import sys import sys

2
flask/app.py
Unescape View File

@ -5,7 +5,7 @@
This module implements the central WSGI application object. This module implements the central WSGI application object.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/blueprints.py
Unescape View File

@ -6,7 +6,7 @@
Blueprints are the recommended way to implement larger or more Blueprints are the recommended way to implement larger or more
pluggable applications in Flask 0.7 and later. pluggable applications in Flask 0.7 and later.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from functools import update_wrapper from functools import update_wrapper

2
flask/cli.py
Unescape View File

@ -5,7 +5,7 @@
A simple command line application to run flask apps. A simple command line application to run flask apps.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/config.py
Unescape View File

@ -5,7 +5,7 @@
Implements the configuration related objects. Implements the configuration related objects.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/ctx.py
Unescape View File

@ -5,7 +5,7 @@
Implements the objects required to keep the context. Implements the objects required to keep the context.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/debughelpers.py
Unescape View File

@ -5,7 +5,7 @@
Various helpers to make the development experience better. Various helpers to make the development experience better.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from ._compat import implements_to_string, text_type from ._compat import implements_to_string, text_type

2
flask/ext/__init__.py
Unescape View File

@ -14,7 +14,7 @@
We're switching from namespace packages because it was just too painful for We're switching from namespace packages because it was just too painful for
everybody involved. everybody involved.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/exthook.py
Unescape View File

@ -16,7 +16,7 @@
This is used by `flask.ext`. This is used by `flask.ext`.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import sys import sys

2
flask/globals.py
Unescape View File

@ -6,7 +6,7 @@
Defines all the global objects that are proxies to the current Defines all the global objects that are proxies to the current
active context. active context.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/helpers.py
Unescape View File

@ -5,7 +5,7 @@
Implements various helpers. Implements various helpers.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/json.py
Unescape View File

@ -5,7 +5,7 @@
Implementation helpers for the JSON support in Flask. Implementation helpers for the JSON support in Flask.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import io import io

2
flask/logging.py
Unescape View File

@ -5,7 +5,7 @@
Implements the logging support for Flask. Implements the logging support for Flask.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/sessions.py
Unescape View File

@ -5,7 +5,7 @@
Implements cookie based sessions based on itsdangerous. Implements cookie based sessions based on itsdangerous.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/signals.py
Unescape View File

@ -6,7 +6,7 @@
Implements signals based on blinker if available, otherwise Implements signals based on blinker if available, otherwise
falls silently back to a noop. falls silently back to a noop.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
signals_available = False signals_available = False

2
flask/templating.py
Unescape View File

@ -5,7 +5,7 @@
Implements the bridge to Jinja2. Implements the bridge to Jinja2.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from jinja2 import BaseLoader, Environment as BaseEnvironment, \ from jinja2 import BaseLoader, Environment as BaseEnvironment, \

2
flask/testing.py
Unescape View File

@ -6,7 +6,7 @@
Implements test support helpers. This module is lazily imported Implements test support helpers. This module is lazily imported
and usually not used in production environments. and usually not used in production environments.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
flask/views.py
Unescape View File

@ -5,7 +5,7 @@
This module provides class-based views inspired by the ones in Django. This module provides class-based views inspired by the ones in Django.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
from .globals import request from .globals import request

2
flask/wrappers.py
Unescape View File

@ -5,7 +5,7 @@
Implements the WSGI wrappers (request and response). Implements the WSGI wrappers (request and response).
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
scripts/flask-07-upgrade.py
Unescape View File

@ -16,7 +16,7 @@
the most common patterns at least. The diff it generates should be the most common patterns at least. The diff it generates should be
hand reviewed and not applied blindly without making backups. hand reviewed and not applied blindly without making backups.
:copyright: (c) Copyright 2014 by Armin Ronacher. :copyright: (c) Copyright 2015 by Armin Ronacher.
:license: see LICENSE for more details. :license: see LICENSE for more details.
""" """
import re import re

2
scripts/flaskext_compat.py
Unescape View File

@ -12,7 +12,7 @@
flaskext_compat.activate() flaskext_compat.activate()
from flask.ext import foo from flask.ext import foo
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import sys import sys

2
scripts/flaskext_tester.py
Unescape View File

@ -5,7 +5,7 @@
Tests the Flask extensions. Tests the Flask extensions.
:copyright: (c) 2014 by Ali Afshar. :copyright: (c) 2015 by Ali Afshar.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
scripts/make-release.py
Unescape View File

@ -7,7 +7,7 @@
Helper script that performs a release. Does pretty much everything Helper script that performs a release. Does pretty much everything
automatically for us. automatically for us.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import sys import sys

2
tests/conftest.py
Unescape View File

@ -3,7 +3,7 @@
tests.conftest tests.conftest
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
:copyright: (c) 2014 by the Flask Team, see AUTHORS for more details. :copyright: (c) 2015 by the Flask Team, see AUTHORS for more details.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import flask import flask

2
tests/test_appctx.py
Unescape View File

@ -5,7 +5,7 @@
Tests the application context. Tests the application context.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_basic.py
Unescape View File

@ -5,7 +5,7 @@
The basic functionality. The basic functionality.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_blueprints.py
Unescape View File

@ -5,7 +5,7 @@
Blueprints (and currently modules) Blueprints (and currently modules)
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_config.py
Unescape View File

@ -3,7 +3,7 @@
tests.test_config tests.test_config
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
:copyright: (c) 2014 by the Flask Team, see AUTHORS for more details. :copyright: (c) 2015 by the Flask Team, see AUTHORS for more details.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_deprecations.py
Unescape View File

@ -5,7 +5,7 @@
Tests deprecation support. Not used currently. Tests deprecation support. Not used currently.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_ext.py
Unescape View File

@ -5,7 +5,7 @@
Tests the extension import thing. Tests the extension import thing.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_helpers.py
Unescape View File

@ -5,7 +5,7 @@
Various helpers. Various helpers.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_instance_config.py
Unescape View File

@ -3,7 +3,7 @@
tests.test_instance tests.test_instance
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
:copyright: (c) 2014 by the Flask Team, see AUTHORS for more details. :copyright: (c) 2015 by the Flask Team, see AUTHORS for more details.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import os import os

2
tests/test_regression.py
Unescape View File

@ -5,7 +5,7 @@
Tests regressions. Tests regressions.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_reqctx.py
Unescape View File

@ -5,7 +5,7 @@
Tests the request context. Tests the request context.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_signals.py
Unescape View File

@ -5,7 +5,7 @@
Signalling. Signalling.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_subclassing.py
Unescape View File

@ -6,7 +6,7 @@
Test that certain behavior of flask can be customized by Test that certain behavior of flask can be customized by
subclasses. subclasses.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import flask import flask

2
tests/test_templating.py
Unescape View File

@ -5,7 +5,7 @@
Template functionality Template functionality
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

2
tests/test_testing.py
Unescape View File

@ -5,7 +5,7 @@
Test client and more. Test client and more.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import pytest import pytest

2
tests/test_views.py
Unescape View File

@ -5,7 +5,7 @@
Pluggable views. Pluggable views.
:copyright: (c) 2014 by Armin Ronacher. :copyright: (c) 2015 by Armin Ronacher.
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """

Write Preview
Loading…
Cancel
Save