Remove deprecated stuff that's scheduled for removal in Zope 2.11

lib/python/ImageFile.py

-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-"""Image object that is stored in a file"""
-
-__version__='$Revision: 1.13 $'[11:-2]
-
-############################################################
-# BBB 2005/11/18 -- This module will be removed in Zope 2.11
-#
-from App.ImageFile import ImageFile
-import warnings
-warnings.warn("The ImageFile module will be removed in Zope 2.11. "
-              "Use App.ImageFile instead.", DeprecationWarning, stacklevel=2)

lib/python/Zope.py

-##############################################################################
-#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Legacy Zope "package" that redirects to the new Zope 2 package
-
-$Id$
-"""
-
-import sys, Zope2
-sys.modules['Zope'] = Zope2
-
-import warnings
-warnings.warn("The Zope package has been renamed to Zope2. "
-              "Import of a package named 'Zope' is deprecated "
-              "and will be disabled starting in Zope 2.11.",
-              DeprecationWarning, stacklevel=2)