[Checkins] [zopefoundation/Zope] b1c176: remove import of ConflictError (#472)

[Michael Howitz]

  Branch: refs/heads/issue_401
  Home:   https://github.com/zopefoundation/Zope
  Commit: b1c176bd86824904263a47b734c210462f05732d
      https://github.com/zopefoundation/Zope/commit/b1c176bd86824904263a47b734c210462f05732d
  Author: Thomas Schorr <t_schorr at gmx.de>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/ZPublisher/WSGIPublisher.py

  Log Message:
  -----------
  remove import of ConflictError (#472)


  Commit: f2b5461c5c79d4de80ad44afd6105172cd6cc8fc
      https://github.com/zopefoundation/Zope/commit/f2b5461c5c79d4de80ad44afd6105172cd6cc8fc
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M src/OFS/ObjectManager.py
    M src/OFS/tests/testObjectManager.py
    M src/OFS/zpt/main.zpt

  Log Message:
  -----------
  - Fix faulty ZMI links due to missing URL-quoting (#465)


  Commit: c5bc5a92cae6be9944a1ddfcec3643b7c2e22b65
      https://github.com/zopefoundation/Zope/commit/c5bc5a92cae6be9944a1ddfcec3643b7c2e22b65
  Author: Jürgen Gmach <jugmac00 at users.noreply.github.com>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M docs/zdgbook/Figures/2-1.png
    M docs/zdgbook/ObjectPublishing.rst

  Log Message:
  -----------
  Update HTTP Publishing section (#470)

Zope 4 no longer ships with the ZServer.

Instead, Zope interacts with a WSGI server.

The description and the figure has been updated accordingly.

cf  #252

modified:   docs/zdgbook/Figures/2-1.png
modified:   docs/zdgbook/ObjectPublishing.rst


  Commit: a8f61a4192afb91d4d3f173a2ea97e518aad58c9
      https://github.com/zopefoundation/Zope/commit/a8f61a4192afb91d4d3f173a2ea97e518aad58c9
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Garden Manifest:

* omit global-exclude (It renders warnings while installing.)
* exclude files not needed in sdist


  Commit: c0603337d30921eef591b65c5f346576faa33103
      https://github.com/zopefoundation/Zope/commit/c0603337d30921eef591b65c5f346576faa33103
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Trick setuptools a bit more so it does not complain on excluding files not included in sdist.


  Commit: 050fc224ec7400672706f52cfcfef63457085b5d
      https://github.com/zopefoundation/Zope/commit/050fc224ec7400672706f52cfcfef63457085b5d
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Sudo is not needed any more.


  Commit: 97e7ea9c19315b311c9996d2dbc27398dba9226e
      https://github.com/zopefoundation/Zope/commit/97e7ea9c19315b311c9996d2dbc27398dba9226e
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M src/Zope2/utilities/skel/etc/wsgi.conf.in
    A src/Zope2/utilities/skel/var/cache/README.txt

  Log Message:
  -----------
  - activate Chameleon caching by default for new WSGI instances


  Commit: 7d3b842e282564e4f02c573f26598226c237b5a7
      https://github.com/zopefoundation/Zope/commit/7d3b842e282564e4f02c573f26598226c237b5a7
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M src/Zope2/utilities/skel/var/cache/README.txt

  Log Message:
  -----------
  - typo [ci skip]


  Commit: e664a8cb1f21d8c2d93f908fc517f5566fd0eba1
      https://github.com/zopefoundation/Zope/commit/e664a8cb1f21d8c2d93f908fc517f5566fd0eba1
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-09 (Sat, 09 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M src/ZPublisher/WSGIPublisher.py
    M src/ZPublisher/tests/test_WSGIPublisher.py

  Log Message:
  -----------
  Make sure conflicts are always retried and not masked by exception views (#473)


  Commit: 7c65ca2d3acf574aa74065f6545124882441bb90
      https://github.com/zopefoundation/Zope/commit/7c65ca2d3acf574aa74065f6545124882441bb90
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-09 (Sat, 09 Feb 2019)

  Changed paths:
    M .travis.yml
    M CHANGES.rst
    M buildout.cfg
    M setup.py
    M src/OFS/tests/testObjectManager.py
    M tox.ini
    M versions-prod.cfg

  Log Message:
  -----------
  Add preliminary support for Python 3.8. (#477)

* Add preliminary support for Python 3.8. as of 3.8.0a1 is released.
* Fix deprecation warning.


  Commit: bd17e8fbab8a1b44a230de676dea1c2439487129
      https://github.com/zopefoundation/Zope/commit/bd17e8fbab8a1b44a230de676dea1c2439487129
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-09 (Sat, 09 Feb 2019)

  Changed paths:
    M src/ZPublisher/tests/test_WSGIPublisher.py

  Log Message:
  -----------
  Improve assert.


  Commit: d0ecaea83a9b38da38a35aff1eee08bfec40bd22
      https://github.com/zopefoundation/Zope/commit/d0ecaea83a9b38da38a35aff1eee08bfec40bd22
  Author: Michael Howitz <mh at gocept.com>
  Date:   2019-02-09 (Sat, 09 Feb 2019)

  Changed paths:
    M .travis.yml
    M CHANGES.rst
    M MANIFEST.in
    M buildout.cfg
    M docs/zdgbook/Figures/2-1.png
    M docs/zdgbook/ObjectPublishing.rst
    M setup.py
    M src/OFS/ObjectManager.py
    M src/OFS/tests/testObjectManager.py
    M src/OFS/zpt/main.zpt
    M src/ZPublisher/WSGIPublisher.py
    M src/ZPublisher/tests/test_WSGIPublisher.py
    M src/Zope2/utilities/skel/etc/wsgi.conf.in
    A src/Zope2/utilities/skel/var/cache/README.txt
    M tox.ini
    M versions-prod.cfg

  Log Message:
  -----------
  Merge branch 'master' into issue_401


Compare: https://github.com/zopefoundation/Zope/compare/53cef22dc2e7...d0ecaea83a9b