[Python-modules-commits] [flask] 06/16: merge patched into master

Ondřej Nový onovy at moszumanska.debian.org
Mon Jul 18 10:20:22 UTC 2016


This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository flask.

commit eca6e020864f30e745760c5348001182285b993d
Merge: 5e89b0e 6d82aa8
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Jul 18 11:41:07 2016 +0200

    merge patched into master

 AUTHORS                                            |    6 +-
 CHANGES                                            |  138 +-
 Flask.egg-info/PKG-INFO                            |   18 +-
 Flask.egg-info/SOURCES.txt                         |  136 +-
 Flask.egg-info/entry_points.txt                    |    4 +
 Flask.egg-info/requires.txt                        |    3 +-
 LICENSE                                            |    2 +-
 MANIFEST.in                                        |   25 +-
 Makefile                                           |   13 +-
 PKG-INFO                                           |   18 +-
 README                                             |   24 +-
 artwork/.DS_Store                                  |  Bin 6148 -> 0 bytes
 artwork/logo-lineart.svg                           |  165 ++
 debian/.git-dpm                                    |    6 +-
 debian/patches/fix_test_appcontext_signals.patch   |   23 -
 debian/patches/fix_test_json_key_sorting.patch     |   63 -
 debian/patches/series                              |    2 -
 docs/_static/flask-favicon.ico                     |  Bin 0 -> 2238 bytes
 docs/_templates/sidebarintro.html                  |    4 +-
 docs/_themes/.gitignore                            |    3 -
 docs/_themes/LICENSE                               |   37 -
 docs/_themes/README                                |   31 -
 docs/_themes/flask/layout.html                     |   16 -
 docs/_themes/flask/relations.html                  |   19 -
 docs/_themes/flask/static/flasky.css_t             |  387 -----
 docs/_themes/flask/static/small_flask.css          |   70 -
 docs/_themes/flask/theme.conf                      |    7 -
 docs/_themes/flask_small/layout.html               |   22 -
 docs/_themes/flask_small/static/flasky.css_t       |  287 ----
 docs/_themes/flask_small/theme.conf                |   10 -
 docs/_themes/flask_theme_support.py                |   86 --
 docs/advanced_foreword.rst                         |    6 +-
 docs/api.rst                                       |  257 ++-
 docs/appcontext.rst                                |   32 +-
 docs/becomingbig.rst                               |    2 +-
 docs/blueprints.rst                                |   41 +-
 docs/cli.rst                                       |  250 +++
 docs/conf.py                                       |   62 +-
 docs/config.rst                                    |   71 +-
 docs/contents.rst.inc                              |    2 +
 docs/deploying/cgi.rst                             |   12 +-
 docs/deploying/fastcgi.rst                         |   65 +-
 docs/deploying/index.rst                           |   35 +-
 docs/deploying/mod_wsgi.rst                        |   55 +-
 docs/deploying/uwsgi.rst                           |   37 +-
 docs/deploying/wsgi-standalone.rst                 |   45 +-
 docs/errorhandling.rst                             |  135 +-
 docs/extensiondev.rst                              |   42 +-
 docs/extensions.rst                                |   17 +-
 docs/foreword.rst                                  |    6 +-
 docs/htmlfaq.rst                                   |    6 +-
 docs/index.rst                                     |    7 +-
 docs/installation.rst                              |   99 +-
 docs/license.rst                                   |    2 +-
 docs/patterns/apierrors.rst                        |    6 +-
 docs/patterns/appdispatch.rst                      |   24 +-
 docs/patterns/appfactories.rst                     |   49 +-
 docs/patterns/caching.rst                          |    6 +-
 docs/patterns/celery.rst                           |   15 +-
 docs/patterns/deferredcallbacks.rst                |    6 +-
 docs/patterns/distribute.rst                       |   86 +-
 docs/patterns/errorpages.rst                       |    8 +-
 docs/patterns/fabric.rst                           |   38 +-
 docs/patterns/favicon.rst                          |    6 +-
 docs/patterns/fileuploads.rst                      |   55 +-
 docs/patterns/flashing.rst                         |   11 +-
 docs/patterns/jquery.rst                           |   18 +-
 docs/patterns/lazyloading.rst                      |    6 +-
 docs/patterns/mongokit.rst                         |   11 +-
 docs/patterns/packages.rst                         |   22 +-
 docs/patterns/sqlalchemy.rst                       |   20 +-
 docs/patterns/sqlite3.rst                          |   37 +-
 docs/patterns/templateinheritance.rst              |    2 +-
 docs/patterns/viewdecorators.rst                   |   33 +-
 docs/patterns/wtforms.rst                          |   54 +-
 docs/python3.rst                                   |   47 +-
 docs/quickstart.rst                                |  236 +--
 docs/reqcontext.rst                                |   10 +-
 docs/security.rst                                  |   93 +-
 docs/server.rst                                    |   52 +
 docs/shell.rst                                     |   14 +-
 docs/signals.rst                                   |  187 +--
 docs/styleguide.rst                                |    2 +-
 docs/templating.rst                                |   15 +-
 docs/testing.rst                                   |   63 +-
 docs/tutorial/css.rst                              |    4 +-
 docs/tutorial/dbcon.rst                            |  109 +-
 docs/tutorial/dbinit.rst                           |   92 +-
 docs/tutorial/folders.rst                          |   16 +-
 docs/tutorial/index.rst                            |   12 +-
 docs/tutorial/introduction.rst                     |   22 +-
 docs/tutorial/schema.rst                           |   14 +-
 docs/tutorial/setup.rst                            |  130 +-
 docs/tutorial/templates.rst                        |   16 +-
 docs/tutorial/testing.rst                          |    2 +-
 docs/tutorial/views.rst                            |   40 +-
 docs/unicode.rst                                   |    2 +-
 docs/upgrading.rst                                 |   96 +-
 docs/views.rst                                     |    4 +-
 examples/.DS_Store                                 |  Bin 6148 -> 0 bytes
 examples/blueprintexample/blueprintexample.py      |    7 +-
 examples/blueprintexample/blueprintexample_test.py |   36 -
 .../simple_page/templates/pages/layout.html        |    4 +-
 examples/blueprintexample/test_blueprintexample.py |   33 +
 examples/flaskr/.gitignore                         |    1 +
 examples/flaskr/README                             |   21 +-
 examples/flaskr/flaskr.py                          |   68 +-
 examples/flaskr/flaskr_tests.py                    |   75 -
 examples/flaskr/schema.sql                         |    2 +-
 examples/flaskr/templates/layout.html              |    8 +-
 examples/flaskr/templates/login.html               |   10 +-
 examples/flaskr/templates/show_entries.html        |   10 +-
 examples/flaskr/test_flaskr.py                     |   77 +
 examples/jqueryexample/jqueryexample.py            |    3 +-
 examples/jqueryexample/templates/index.html        |   10 +-
 examples/jqueryexample/templates/layout.html       |    4 +-
 examples/minitwit/README                           |   21 +-
 examples/minitwit/minitwit.py                      |   25 +-
 examples/minitwit/minitwit_tests.py                |  149 --
 examples/minitwit/templates/layout.html            |   12 +-
 examples/minitwit/templates/login.html             |   10 +-
 examples/minitwit/templates/register.html          |   14 +-
 examples/minitwit/templates/timeline.html          |   16 +-
 examples/minitwit/test_minitwit.py                 |  151 ++
 examples/persona/.DS_Store                         |  Bin 6148 -> 0 bytes
 examples/persona/README.md                         |    3 +
 examples/persona/persona.py                        |    8 +-
 examples/persona/static/.DS_Store                  |  Bin 6148 -> 0 bytes
 examples/persona/templates/layout.html             |    8 +-
 flask/__init__.py                                  |   11 +-
 flask/__main__.py                                  |   15 +
 flask/_compat.py                                   |   45 +-
 flask/app.py                                       |  540 ++++---
 flask/blueprints.py                                |   26 +-
 flask/cli.py                                       |  482 ++++++
 flask/config.py                                    |  104 +-
 flask/ctx.py                                       |  130 +-
 flask/debughelpers.py                              |   74 +-
 flask/ext/__init__.py                              |    2 +-
 flask/exthook.py                                   |   29 +-
 flask/globals.py                                   |   25 +-
 flask/helpers.py                                   |  227 ++-
 flask/json.py                                      |   67 +-
 flask/logging.py                                   |   67 +-
 flask/module.py                                    |   42 -
 flask/sessions.py                                  |  116 +-
 flask/signals.py                                   |    9 +-
 flask/templating.py                                |   72 +-
 flask/testing.py                                   |   15 +-
 flask/testsuite/__init__.py                        |  246 ---
 flask/testsuite/appctx.py                          |  101 --
 flask/testsuite/basic.py                           | 1254 ---------------
 flask/testsuite/blueprints.py                      |  790 ----------
 flask/testsuite/config.py                          |  299 ----
 flask/testsuite/deprecations.py                    |   24 -
 flask/testsuite/examples.py                        |   38 -
 flask/testsuite/ext.py                             |  134 --
 flask/testsuite/regression.py                      |  116 --
 flask/testsuite/reqctx.py                          |  185 ---
 flask/testsuite/signals.py                         |  153 --
 flask/testsuite/subclassing.py                     |   46 -
 flask/testsuite/templating.py                      |  302 ----
 flask/testsuite/test_apps/config_module_app.py     |    4 -
 .../test_apps/config_package_app/__init__.py       |    4 -
 flask/testsuite/test_apps/flask_broken/__init__.py |    2 -
 flask/testsuite/test_apps/flask_broken/b.py        |    0
 .../test_apps/flask_newext_package/__init__.py     |    1 -
 .../test_apps/flask_newext_package/submodule.py    |    2 -
 flask/testsuite/test_apps/flask_newext_simple.py   |    1 -
 .../test_apps/flaskext/oldext_package/__init__.py  |    1 -
 .../test_apps/flaskext/oldext_package/submodule.py |    2 -
 .../testsuite/test_apps/flaskext/oldext_simple.py  |    1 -
 flask/testsuite/test_apps/importerror.py           |    2 -
 .../lib/python2.5/site-packages/SiteEgg.egg        |  Bin 1218 -> 0 bytes
 .../lib/python2.5/site-packages/site_app.py        |    3 -
 .../site-packages/site_package/__init__.py         |    3 -
 flask/testsuite/test_apps/main_app.py              |    4 -
 flask/testsuite/test_apps/moduleapp/__init__.py    |    7 -
 .../testsuite/test_apps/moduleapp/apps/__init__.py |    0
 .../test_apps/moduleapp/apps/admin/__init__.py     |   14 -
 .../moduleapp/apps/admin/static/css/test.css       |    1 -
 .../test_apps/moduleapp/apps/admin/static/test.txt |    1 -
 .../moduleapp/apps/admin/templates/index.html      |    1 -
 .../test_apps/moduleapp/apps/frontend/__init__.py  |    9 -
 .../moduleapp/apps/frontend/templates/index.html   |    1 -
 .../test_apps/path/installed_package/__init__.py   |    3 -
 flask/testsuite/testing.py                         |  242 ---
 flask/testsuite/views.py                           |  169 --
 flask/views.py                                     |   16 +-
 flask/wrappers.py                                  |   72 +-
 run-tests.py                                       |    5 -
 setup.cfg                                          |   14 +-
 setup.py                                           |   75 +-
 tests/conftest.py                                  |  133 ++
 tests/static/config.json                           |    4 +
 {flask/testsuite => tests}/static/index.html       |    0
 {flask/testsuite => tests}/templates/_macro.html   |    0
 .../templates/context_template.html                |    0
 .../templates/escaping_template.html               |    0
 {flask/testsuite => tests}/templates/mail.txt      |    0
 .../templates/nested/nested.txt                    |    0
 .../templates/non_escaping_template.txt            |    2 +
 .../templates/simple_template.html                 |    0
 .../templates/template_filter.html                 |    0
 .../templates/template_test.html                   |    0
 tests/test_appctx.py                               |  170 ++
 .../test_apps/blueprintapp/__init__.py             |    1 +
 .../test_apps/blueprintapp/apps/__init__.py        |    0
 .../test_apps/blueprintapp/apps/admin/__init__.py  |    0
 .../blueprintapp/apps/admin/static/css/test.css    |    0
 .../blueprintapp/apps/admin/static/test.txt        |    0
 .../apps/admin/templates/admin/index.html          |    0
 .../blueprintapp/apps/frontend/__init__.py         |    5 +
 .../apps/frontend/templates/frontend/index.html    |    0
 .../test_apps/cliapp}/__init__.py                  |    0
 tests/test_apps/cliapp/app.py                      |    5 +
 tests/test_apps/cliapp/multiapp.py                 |    6 +
 .../test_apps/subdomaintestmodule/__init__.py      |    0
 .../test_apps/subdomaintestmodule/static/hello.txt |    0
 tests/test_basic.py                                | 1630 ++++++++++++++++++++
 tests/test_blueprints.py                           |  574 +++++++
 tests/test_cli.py                                  |  143 ++
 tests/test_config.py                               |  189 +++
 tests/test_deprecations.py                         |   50 +
 tests/test_ext.py                                  |  187 +++
 .../testsuite/helpers.py => tests/test_helpers.py  |  414 +++--
 tests/test_instance_config.py                      |  134 ++
 tests/test_regression.py                           |  102 ++
 tests/test_reqctx.py                               |  195 +++
 tests/test_signals.py                              |  202 +++
 tests/test_subclassing.py                          |   37 +
 tests/test_templating.py                           |  392 +++++
 tests/test_testing.py                              |  236 +++
 tests/test_user_error_handler.py                   |  140 ++
 tests/test_views.py                                |  162 ++
 235 files changed, 9306 insertions(+), 7741 deletions(-)

diff --cc debian/.git-dpm
index 08fc2a0,0000000..025ce9b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- ad6106ffe193ebb0f552eb201fae74af553b26c9
- ad6106ffe193ebb0f552eb201fae74af553b26c9
- 5c08b7767a9c78c1aa67bf35832b28a11377a230
++6d82aa89744b50eee77673cf99929241c4d65dae
++6d82aa89744b50eee77673cf99929241c4d65dae
++6d82aa89744b50eee77673cf99929241c4d65dae
 +6d82aa89744b50eee77673cf99929241c4d65dae
 +flask_0.11.1.orig.tar.gz
 +8144bfba25a266ff572d19530472f403c96ad911
 +564993
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask.git



More information about the Python-modules-commits mailing list