[Checkins] SVN: zope.formlib/trunk/ Remove deprecated stuff. Remove dependency on zope.deferredimport as we don't need it anymore.

[Dan Korostelev]

Log message for revision 97483:
  Remove deprecated stuff. Remove dependency on zope.deferredimport as we don't need it anymore.

Changed:
  U   zope.formlib/trunk/CHANGES.txt
  U   zope.formlib/trunk/setup.py
  U   zope.formlib/trunk/src/zope/formlib/__init__.py
  U   zope.formlib/trunk/src/zope/formlib/interfaces.py
  D   zope.formlib/trunk/src/zope/formlib/page.py

-=-
Modified: zope.formlib/trunk/CHANGES.txt
===================================================================
--- zope.formlib/trunk/CHANGES.txt	2009-03-04 19:01:12 UTC (rev 97482)
+++ zope.formlib/trunk/CHANGES.txt	2009-03-04 19:14:25 UTC (rev 97483)
@@ -5,6 +5,7 @@
 3.5.3 (unreleased)
 ==================
 
+- Remove deprecated imports.
 
 3.5.2 (2009-02-21)
 ==================

Modified: zope.formlib/trunk/setup.py
===================================================================
--- zope.formlib/trunk/setup.py	2009-03-04 19:01:12 UTC (rev 97482)
+++ zope.formlib/trunk/setup.py	2009-03-04 19:14:25 UTC (rev 97483)
@@ -51,7 +51,6 @@
                         'zope.app.form',
                         'zope.app.pagetemplate',
                         'zope.component',
-                        'zope.deferredimport',
                         'zope.event',
                         'zope.i18n',
                         'zope.i18nmessageid',

Modified: zope.formlib/trunk/src/zope/formlib/__init__.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/__init__.py	2009-03-04 19:01:12 UTC (rev 97482)
+++ zope.formlib/trunk/src/zope/formlib/__init__.py	2009-03-04 19:14:25 UTC (rev 97483)
@@ -13,11 +13,3 @@
 """
 $Id$
 """
-
-# BBB 2006/04/19 -- to be removed after 12 months
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "It has moved to zope.publisher.browser.BrowserPage.  This reference "
-    "will be gone in Zope 3.5.",
-    Page = 'zope.publisher.browser:BrowserPage',
-    )

Modified: zope.formlib/trunk/src/zope/formlib/interfaces.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/interfaces.py	2009-03-04 19:01:12 UTC (rev 97482)
+++ zope.formlib/trunk/src/zope/formlib/interfaces.py	2009-03-04 19:14:25 UTC (rev 97483)
@@ -18,18 +18,7 @@
 from zope import interface, schema
 from zope.publisher.interfaces.browser import IBrowserPage
 
-##############################################################################
-# BBB 2006/04/19 -- to be removed after 12 months
 
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "It has moved to zope.publisher.interfaces.browser.IBrowserPage.  "
-    "This reference will be gone in Zope 3.5.",
-    IPage = 'zope.publisher.interfaces.browser:IBrowserPage',
-    )
-
-##############################################################################
-
 class FormError(Exception):
     """There was an error in managing the form
     """

Deleted: zope.formlib/trunk/src/zope/formlib/page.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/page.py	2009-03-04 19:01:12 UTC (rev 97482)
+++ zope.formlib/trunk/src/zope/formlib/page.py	2009-03-04 19:14:25 UTC (rev 97483)
@@ -1,25 +0,0 @@
-##############################################################################
-#
-# 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.
-#
-##############################################################################
-"""Simple Page support
-
-This module has been deprecated and will be gone in Zope 3.5.
-
-$Id$
-"""
-# BBB 2006/04/19 -- to be removed after 12 months
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "It has moved to zope.publisher.browser.BrowserPage.  This reference "
-    "will be gone in Zope 3.5.",
-    Page = 'zope.publisher.browser:BrowserPage',
-    )