[Checkins] [zopefoundation/Zope] 0693e5: - more merge cleanup

[Jens Vagelpohl]

  Branch: refs/heads/issue_479
  Home:   https://github.com/zopefoundation/Zope
  Commit: 0693e5aad11749f3efa08e02e2c4e30d781fd085
      https://github.com/zopefoundation/Zope/commit/0693e5aad11749f3efa08e02e2c4e30d781fd085
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-03-24 (Sun, 24 Mar 2019)

  Changed paths:
    M src/App/FactoryDispatcher.py
    M src/OFS/DTMLDocument.py
    M src/Products/PageTemplates/ZopePageTemplate.py
    M src/Testing/ZopeTestCase/ZopeLite.py
    M src/Testing/tests/test_testbrowser.py
    M src/ZPublisher/tests/testHTTPResponse.py
    M src/ZPublisher/tests/test_xmlrpc.py
    M src/Zope2/App/tests/test_safe_formatter.py

  Log Message:
  -----------
  - more merge cleanup


  Commit: 9a7021815a4100ea07b3929e1f6f513827e66c85
      https://github.com/zopefoundation/Zope/commit/9a7021815a4100ea07b3929e1f6f513827e66c85
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-03-24 (Sun, 24 Mar 2019)

  Changed paths:
    M src/Products/Five/tests/testing/__init__.py
    M src/Products/PageTemplates/PageTemplateFile.py
    M src/ZTUtils/__init__.py

  Log Message:
  -----------
  - add more flake8 test exclusions where needed


Compare: https://github.com/zopefoundation/Zope/compare/9313a9838d2c...9a7021815a41