Merge branch 'master' into jensens-enable-warning-overrides

src/Products/Five/browser/tests/resource.txt

@@ -69,17 +69,6 @@ PageTemplateResource's __call__ renders the template
   ...     if not isinstance(resource, PageTemplateResource):
   ...         self.assertEquals(resource(), base_url % r)
 
-Missing resources   
-~~~~~~~~~~~~~~~~~
-
-Looking up a missing resource raises a ``KeyError``, which the publisher
-then maps onto an HTTP 404 ("Not Found") response:
-
-  >>> self.folder.unrestrictedTraverse('testoid/++resource++nonesuch.txt')
-  Traceback (most recent call last):
-  ...
-  KeyError: ...
-
 Clean up
 --------
 

versions.cfg

@@ -6,10 +6,10 @@ versions = versions
 # Zope2-specific
 Zope2 =
 AccessControl = 3.0.11
-Acquisition = 4.0.3
+Acquisition = 4.1
 DateTime = 4.0.1
 DocumentTemplate = 2.13.2
-ExtensionClass = 4.1a1
+ExtensionClass = 4.1
 initgroups = 2.13.0
 Missing = 3.0
 MultiMapping = 2.13.0

ztk-versions.cfg

 [versions]
 # ZTK
-zope.annotation = 4.2.0
+zope.annotation = 4.4.1
 zope.applicationcontrol = 4.0.0
-zope.authentication = 4.1.0
-zope.browser = 2.0.2
+zope.authentication = 4.2.0
+zope.browser = 2.1.0
 zope.browsermenu = 4.1.0
 zope.browserpage = 4.1.0
-zope.browserresource = 4.0.2
-zope.cachedescriptors = 4.0.0
+zope.browserresource = 4.1.0
+zope.cachedescriptors = 4.1.0
 zope.catalog = 4.0.0
 zope.component = 4.2.1
 zope.componentvocabulary = 2.0.0
 zope.configuration = 4.0.3
 zope.container = 4.0.0
 zope.contentprovider = 4.0.0
-zope.contenttype = 4.0.1
-zope.copy = 4.0.2
+zope.contenttype = 4.1.0
+zope.copy = 4.0.3
 zope.copypastemove = 4.0.0
-zope.datetime = 4.0.0
-zope.deferredimport = 4.0.0
-zope.deprecation = 4.1.1
-zope.dottedname = 4.0.1
-zope.dublincore = 4.0.1
-zope.error = 4.1.1
+zope.datetime = 4.1.0
+zope.deferredimport = 4.1.0
+zope.deprecation = 4.1.2
+zope.dottedname = 4.1.0
+zope.dublincore = 4.1.1
+zope.error = 4.2.0
 zope.event = 4.0.3
 zope.exceptions = 4.0.7
-zope.filerepresentation = 4.0.2
+zope.filerepresentation = 4.1.0
 zope.formlib = 4.3.0
 zope.hookable = 4.0.4
 zope.i18n = 4.0.0
 zope.i18nmessageid = 4.0.3
-zope.index = 4.0.1
-zope.interface = 4.1.1
-zope.intid = 4.0.0
-zope.keyreference = 4.0.0
-zope.lifecycleevent = 4.0.3
+zope.index = 4.1.0
+zope.interface = 4.1.2
+zope.intid = 4.1.0
+zope.keyreference = 4.1.0
+zope.lifecycleevent = 4.1.0
 zope.location = 4.0.3
 zope.login = 2.0.0
 zope.mimetype = 2.0.0
-zope.minmax = 2.0.0
-zope.pagetemplate = 4.0.4
-zope.password = 4.0.2
+zope.minmax = 2.1.0
+zope.pagetemplate = 4.1.0
+zope.password = 4.1.0
 zope.pluggableauth = 2.0.0
-zope.principalannotation = 4.0.0
+zope.principalannotation = 4.1.0
 zope.principalregistry = 4.0.0
-zope.processlifetime = 2.0
+zope.processlifetime = 2.1.0
 zope.proxy = 4.1.4
 zope.ptresource = 4.0.0
-zope.publisher = 4.0.0
-zope.ramcache = 2.0.0
+zope.publisher = 4.1.0
+zope.ramcache = 2.1.0
 zope.schema = 4.4.2
 zope.security = 4.0.1
 zope.securitypolicy = 4.0.0
-zope.sendmail = 4.0.0
+zope.sendmail = 4.0.1
 zope.session = 4.0.0
 zope.site = 4.0.0
-zope.size = 4.0.1
-zope.structuredtext = 4.0.0
-zope.tal = 4.0.0
-zope.tales = 4.0.2
+zope.size = 4.1.0
+zope.structuredtext = 4.1.0
+zope.tal = 4.1.0
+zope.tales = 4.1.0
 zope.testing = 4.1.3
-zope.testrunner = 4.4.3
+zope.testrunner = 4.4.6
 zope.traversing = 4.0.0
 zope.viewlet = 4.0.0
 
 # Dependencies
-BTrees = 4.0.8
+BTrees = 4.1.1
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
 PasteDeploy = 1.5.2
-Pygments = 2.0.1
+Pygments = 2.0.2
 Sphinx = 1.2.3
 WebOb = 1.4
-WebTest = 2.0.17
+WebTest = 2.0.18
 ZConfig = 3.0.4
 coverage = 3.7.1
 docutils = 0.12
@@ -85,8 +85,8 @@ python-gettext = 2.1
 python-mimeparse = 0.1.4
 python-subunit = 1.0.0
 pytz = 2014.10
-setuptools = 8.2.1
-six = 1.8.0
+setuptools = 12.2
+six = 1.9.0
 testtools = 1.5.0
 transaction = 1.4.3
 z3c.recipe.sphinxdoc = 1.0.0
@@ -94,7 +94,7 @@ zc.buildout = 2.3.1
 zc.lockfile = 1.1.0
 zc.recipe.egg = 2.0.1
 zc.recipe.testrunner = 2.0.0
-zdaemon = 4.0.0
+zdaemon = 4.0.1
 zodbpickle = 0.5.2
 
 # Dependencies for Python 2
@@ -113,15 +113,16 @@ unittest2 = 0.8.0
 zc.resourcelibrary = 1.3.4
 zope.mkzeoinstance = 3.9.6
 # Needs merge of py3 branch.
-ZODB = 4.0.1
+ZODB = 4.1.0
 # Do we really need ZEO?
-ZEO = 4.0.0
+ZEO = 4.1.0
 
 # toolchain
 argparse = 1.3.0
-lxml = 3.4.1
+lxml = 3.4.2
 mr.developer = 1.31
 repoze.sphinx.autointerface = 0.7.1
+collective.recipe.cmd = 0.9
 # Missing py3 port
 z3c.checkversions = 0.5
 z3c.recipe.compattest = 1.0