[Python-modules-commits] [python-bleach] 02/05: Merge tag 'upstream/2.1.2' into debian/master

[Scott Kitterman]

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

kitterman pushed a commit to branch debian/master
in repository python-bleach.

commit 4d11ffe90546f77401abd37e4057a80e931fdc12
Merge: d3ba0a8 0bf95a3
Author: Scott Kitterman <scott at kitterman.com>
Date:   Tue Jan 9 23:25:10 2018 -0500

    Merge tag 'upstream/2.1.2' into debian/master
    
    Upstream version 2.1.2

 .gitignore                               |   1 +
 CHANGES                                  | 262 ++++++++++++++----
 CODE_OF_CONDUCT.rst                      |   9 +
 CONTRIBUTORS                             |  10 +-
 MANIFEST.in                              |   3 +
 README.rst                               |  36 ++-
 bleach/__init__.py                       |  28 +-
 bleach/callbacks.py                      |  10 +-
 bleach/encoding.py                       |  62 -----
 bleach/linkifier.py                      |  19 +-
 bleach/sanitizer.py                      | 317 ++++++++++++++++++++-
 bleach/utils.py                          |  21 ++
 bleach/version.py                        |   6 -
 docs/clean.rst                           |  36 ++-
 docs/conf.py                             |  14 +-
 docs/dev.rst                             |  34 ++-
 docs/goals.rst                           |  76 +++++-
 setup.py                                 |  27 +-
 tests/data/13.test.out                   |   2 +-
 tests/data/14.test.out                   |   2 +-
 tests/data/15.test.out                   |   2 +-
 tests/data/16.test.out                   |   2 +-
 tests/data/17.test.out                   |   2 +-
 tests/data/18.test.out                   |   2 +-
 tests/data/19.test.out                   |   3 +-
 tests/data/20.test                       |   1 +
 tests/data/20.test.out                   |   1 +
 tests/test_basics.py                     | 365 -------------------------
 tests/test_callbacks.py                  |  63 +++++
 tests/test_clean.py                      | 454 +++++++++++++++++++++++++++++++
 tests/{test_links.py => test_linkify.py} |  33 ++-
 tests/test_security.py                   |  42 ++-
 tests_website/.gitignore                 |   1 +
 tests_website/README.rst                 |  28 ++
 tests_website/data_to_json.py            |  53 ++++
 tests_website/index.html                 | 149 ++++++++++
 tests_website/open_test_page.py          |  36 +++
 tests_website/server.py                  |  52 ++++
 tox.ini                                  |  61 ++++-
 39 files changed, 1753 insertions(+), 572 deletions(-)

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