Merge branch '1.1.x'

13 files changed, 60 insertions, 50 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 44d8333..c576a9f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,7 +30,7 @@ deploy:
 branches:
   only:
     - master
-    - /^.*\.x$/
+    - /^\d+(\.\d+)*(\.x)?$/
 
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7be015d..6a86504 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.3.1
+    rev: v1.3.5
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories", "src"]
@@ -8,11 +8,14 @@ repos:
     rev: 18.9b0
     hooks:
       - id: black
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.6
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-bugbear]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v2.1.0
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: flake8
-        additional_dependencies: [flake8-bugbear]
diff --git a/.travis.yml b/.travis.yml
index 7abf38b..eac6fcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,18 @@
 os: linux
-sudo: false
+dist: xenial
 language: python
 python:
+  - "3.7"
   - "3.6"
   - "3.5"
   - "3.4"
   - "2.7"
   - "nightly"
-  - "pypy3"
+  - "pypy3.5-6.0"
 env: TOXENV=py,codecov
 
 matrix:
   include:
-    - dist: xenial
-      sudo: required
-      python: "3.7"
     - env: TOXENV=stylecheck,docs-html
     - stage: wheel
       sudo: required
@@ -25,6 +23,9 @@ matrix:
       script: &wheel_script
         - cibuildwheel --output-dir wheelhouse
       deploy: &wheel_deploy
+        on:
+          all_branches: true
+          condition: $TRAVIS_BRANCH =~ ^(master|[0-9]+(.[0-9]+)*(.x)?)$
         skip_cleanup: true
         provider: s3
         access_key_id:
@@ -44,7 +45,7 @@ matrix:
       deploy: *wheel_deploy
   allow_failures:
     - python: nightly
-    - python: pypy3
+    - python: pypy3.5-6.0
   fast_finish: true
 
 stages:
@@ -66,7 +67,7 @@ cache:
 branches:
   only:
     - master
-    - /^.*\.x$/
+    - /^\d+(\.\d+)*(\.x)?$/
 
 notifications:
   email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index 7666966..63ecd67 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+Version 1.1.1
+-------------
+
+Released 2019-02-23
+
+-   Fix segfault when ``__html__`` method raises an exception when using
+    the C speedups. The exception is now propagated correctly. (`#109`_)
+
+.. _#109: https://github.com/pallets/markupsafe/pull/109
+
+
 Version 1.1.0
 -------------
 
diff --git a/LICENSE.rst b/LICENSE.rst
index 28c9258..9d227a0 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -1,33 +1,28 @@
-`BSD 3-Clause <https://opensource.org/licenses/BSD-3-Clause>`_
-
-Copyright © 2010 by the Pallets team.
-
-Some rights reserved.
+Copyright 2010 Pallets
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
--   Redistributions of source code must retain the above copyright
+1.  Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
--   Redistributions in binary form must reproduce the above copyright
+2.  Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
--   Neither the name of the copyright holder nor the names of its
+3.  Neither the name of the copyright holder nor the names of its
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.rst b/README.rst
index 1524e80..3548b8d 100644
--- a/README.rst
+++ b/README.rst
@@ -49,15 +49,15 @@ libraries that use it. In order to grow the community of contributors
 and users, and allow the maintainers to devote more time to the
 projects, `please donate today`_.
 
-.. _please donate today: https://psfmember.org/civicrm/contribute/transact?reset=1&id=20
+.. _please donate today: https://palletsprojects.com/donate
 
 
 Links
 -----
 
-*   Website: https://www.palletsprojects.com/p/markupsafe/
+*   Website: https://palletsprojects.com/p/markupsafe/
 *   Documentation: https://markupsafe.palletsprojects.com/
-*   License: `BSD <https://github.com/pallets/markupsafe/blob/master/LICENSE.rst>`_
+*   License: `BSD-3-Clause <https://github.com/pallets/markupsafe/blob/master/LICENSE.rst>`_
 *   Releases: https://pypi.org/project/MarkupSafe/
 *   Code: https://github.com/pallets/markupsafe
 *   Issue tracker: https://github.com/pallets/markupsafe/issues
diff --git a/setup.py b/setup.py
index 4ad5182..5c57d1c 100644
--- a/setup.py
+++ b/setup.py
@@ -53,16 +53,16 @@ def run_setup(with_binary):
     setup(
         name="MarkupSafe",
         version=version,
-        url="https://www.palletsprojects.com/p/markupsafe/",
+        url="https://palletsprojects.com/p/markupsafe/",
         project_urls={
             "Documentation": "https://markupsafe.palletsprojects.com/",
             "Code": "https://github.com/pallets/markupsafe",
             "Issue tracker": "https://github.com/pallets/markupsafe/issues",
         },
-        license="BSD",
+        license="BSD-3-Clause",
         author="Armin Ronacher",
         author_email="armin.ronacher@active-4.com",
-        maintainer="Pallets Team",
+        maintainer="The Pallets Team",
         maintainer_email="contact@palletsprojects.com",
         description="Safely add untrusted strings to HTML/XML markup.",
         long_description=readme,
diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py
index 5e09525..da05ed3 100644
--- a/src/markupsafe/__init__.py
+++ b/src/markupsafe/__init__.py
@@ -6,8 +6,8 @@ markupsafe
 Implements an escape function and a Markup string to replace HTML
 special characters with safe representations.
 
-:copyright: © 2010 by the Pallets team.
-:license: BSD, see LICENSE for more details.
+:copyright: 2010 Pallets
+:license: BSD-3-Clause
 """
 import re
 import string
@@ -20,7 +20,7 @@ from ._compat import string_types
 from ._compat import text_type
 from ._compat import unichr
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 __all__ = ["Markup", "soft_unicode", "escape", "escape_silent"]
 
diff --git a/src/markupsafe/_compat.py b/src/markupsafe/_compat.py
index e51d57d..bc05090 100644
--- a/src/markupsafe/_compat.py
+++ b/src/markupsafe/_compat.py
@@ -3,8 +3,8 @@
 markupsafe._compat
 ~~~~~~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
-:license: BSD, see LICENSE for more details.
+:copyright: 2010 Pallets
+:license: BSD-3-Clause
 """
 import sys
 
diff --git a/src/markupsafe/_constants.py b/src/markupsafe/_constants.py
index 83670cb..7c57c2d 100644
--- a/src/markupsafe/_constants.py
+++ b/src/markupsafe/_constants.py
@@ -3,8 +3,8 @@
 markupsafe._constants
 ~~~~~~~~~~~~~~~~~~~~~
 
-:copyright: © 2010 by the Pallets team.
-:license: BSD, see LICENSE for more details.
+:copyright: 2010 Pallets
+:license: BSD-3-Clause
 """
 
 HTML_ENTITIES = {
diff --git a/src/markupsafe/_native.py b/src/markupsafe/_native.py
index 245f03a..cd08752 100644
--- a/src/markupsafe/_native.py
+++ b/src/markupsafe/_native.py
@@ -5,8 +5,8 @@ markupsafe._native
 
 Native Python implementation used when the C module is not compiled.
 
-:copyright: © 2010 by the Pallets team.
-:license: BSD, see LICENSE for more details.
+:copyright: 2010 Pallets
+:license: BSD-3-Clause
 """
 from . import Markup
 from ._compat import text_type
diff --git a/src/markupsafe/_speedups.c b/src/markupsafe/_speedups.c
index b27435e..12d2c4a 100644
--- a/src/markupsafe/_speedups.c
+++ b/src/markupsafe/_speedups.c
@@ -5,8 +5,8 @@
  * C implementation of escaping for better performance. Used instead of
  * the native Python implementation when compiled.
  *
- * :copyright: © 2010 by the Pallets team.
- * :license: BSD, see LICENSE for more details.
+ * :copyright: 2010 Pallets
+ * :license: BSD-3-Clause
  */
 #include <Python.h>
 
diff --git a/tox.ini b/tox.ini
index aaa666e..8e07c65 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,36,35,34,27,py3,py}
+    py{37,36,35,34,27,py3,py3,py}
     stylecheck
     docs-html
     coverage-report