[Checkins] [zopefoundation/Zope] 3befda: Extend hardening against 'six' renames to include ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/Zope
  Commit: 3befdaf506ec9800cc345a8bcd138954171d7a3b
      https://github.com/zopefoundation/Zope/commit/3befdaf506ec9800cc345a8bcd138954171d7a3b
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M src/App/ApplicationManager.py

  Log Message:
  -----------
  Extend hardening against 'six' renames to include vendored version.

Forward-port bca6b38 from 2.13 branch.