[Checkins] SVN: zope.publisher/trunk/ Remove deprecated stuff, remove explicit dependency on zope.deferredimport and zope.deprecation.
Dan Korostelev
nadako at gmail.com
Wed Mar 4 14:31:34 EST 2009
Log message for revision 97485:
Remove deprecated stuff, remove explicit dependency on zope.deferredimport and zope.deprecation.
Shut up python 2.6 warnings.
Remove zpkg stuff.
Fix browserrequest test.
Changed:
U zope.publisher/trunk/CHANGES.txt
U zope.publisher/trunk/setup.py
D zope.publisher/trunk/src/zope/publisher/DEPENDENCIES.cfg
U zope.publisher/trunk/src/zope/publisher/base.py
U zope.publisher/trunk/src/zope/publisher/http.py
U zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py
D zope.publisher/trunk/src/zope/publisher/interfaces/back35.py
U zope.publisher/trunk/src/zope/publisher/interfaces/browser.py
U zope.publisher/trunk/src/zope/publisher/tests/test_browserrequest.py
-=-
Modified: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/CHANGES.txt 2009-03-04 19:31:33 UTC (rev 97485)
@@ -7,7 +7,10 @@
- Feature: added ISkinnable interface which allows us to implement the apply
skin pattern not only for IBrowserRequest
+- Fix: Don't cause warnings on Python 2.6
+- Remove deprecated code.
+
3.5.6 (2009-02-14)
------------------
Modified: zope.publisher/trunk/setup.py
===================================================================
--- zope.publisher/trunk/setup.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/setup.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -48,9 +48,7 @@
'zope.interface',
'zope.location',
'zope.proxy',
- 'zope.security',
- 'zope.deprecation',
- 'zope.deferredimport'],
+ 'zope.security'],
extras_require=dict(
test=['zope.testing',
'zope.app.testing'],
Deleted: zope.publisher/trunk/src/zope/publisher/DEPENDENCIES.cfg
===================================================================
--- zope.publisher/trunk/src/zope/publisher/DEPENDENCIES.cfg 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/DEPENDENCIES.cfg 2009-03-04 19:31:33 UTC (rev 97485)
@@ -1,11 +0,0 @@
-zope.component
-zope.event
-zope.exceptions
-zope.i18n
-zope.interface
-zope.location
-zope.proxy
-zope.security
-zope.testing
-zope.deprecation
-zope.deferredimport
Modified: zope.publisher/trunk/src/zope/publisher/base.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/base.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/base.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -20,8 +20,6 @@
"""
from cStringIO import StringIO
-from zope.deprecation import deprecated
-
from zope.interface import implements, providedBy
from zope.interface.common.mapping import IReadMapping, IEnumerableMapping
from zope.exceptions.exceptionformatter import print_exception
Modified: zope.publisher/trunk/src/zope/publisher/http.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/http.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/http.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -26,7 +26,6 @@
from tempfile import TemporaryFile
from zope import component, interface, event
-from zope.deprecation import deprecation
import zope.publisher
from zope.publisher import contenttype
@@ -618,9 +617,6 @@
__slots__ = (
'authUser', # Authenticated user string
- # BBB: Remove for Zope 3.4.
- '_header_output', # Hook object to collaborate with a server
- # for header generation.
'_headers',
'_cookies',
'_status', # The response status (usually an integer)
Modified: zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/interfaces/__init__.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -16,14 +16,6 @@
$Id$
"""
__docformat__ = "reStructuredText"
-
-import zope.deferredimport
-
-zope.deferredimport.deprecated(
- "ILayer will go away in Zope 3.5",
- ILayer = 'zope.publisher.interfaces.back35:ILayer',
- )
-
from zope.component.interfaces import IPresentationRequest
from zope.interface import Interface, Attribute, implements
from zope.interface.common.mapping import IEnumerableMapping
@@ -79,6 +71,8 @@
class DebugError(TraversalException):
implements(IDebugError)
+ message = None # override this not to cause warnings in python 2.6
+
def __init__(self, ob, message):
self.ob = ob
self.message = message
@@ -100,6 +94,8 @@
implements(IBadRequest)
+ message = None # override this not to cause warnings in python 2.6
+
def __init__(self, message):
self.message = message
Deleted: zope.publisher/trunk/src/zope/publisher/interfaces/back35.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/interfaces/back35.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/interfaces/back35.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -1,22 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 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.
-#
-##############################################################################
-"""Deprecated things that should go away in Zope 3.5.
-
-$Id$
-"""
-
-from zope.interface.interfaces import IInterface
-
-class ILayer(IInterface):
- """A grouping of related views for a request."""
Modified: zope.publisher/trunk/src/zope/publisher/interfaces/browser.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/interfaces/browser.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/interfaces/browser.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -142,21 +142,3 @@
class IBrowserSkinType(IInterface):
"""A skin is a set of layers."""
-
-##############################################################################
-#
-# BBB 2006/02/18, to be removed after 12 months
-#
-
-# mark the default layer for BBB reasons
-from zope.publisher.interfaces.back35 import ILayer
-directlyProvides(IDefaultBrowserLayer, ILayer)
-
-import zope.deprecation
-ISkin = IBrowserSkinType
-zope.deprecation.deprecated('ISkin',
- 'The zope.publisher.interfaces.browser.ISkin '
- 'interface has been renamed to IBrowserSkinType. '
- 'The old alias will go away in Zope 3.5.')
-#
-##############################################################################
Modified: zope.publisher/trunk/src/zope/publisher/tests/test_browserrequest.py
===================================================================
--- zope.publisher/trunk/src/zope/publisher/tests/test_browserrequest.py 2009-03-04 19:15:40 UTC (rev 97484)
+++ zope.publisher/trunk/src/zope/publisher/tests/test_browserrequest.py 2009-03-04 19:31:33 UTC (rev 97485)
@@ -492,6 +492,7 @@
request = self._createRequest(
dict(REQUEST_METHOD='POST',
CONTENT_TYPE='application/x-www-form-urlencoded',
+ QUERY_STRING='',
),
'x=1&y=2')
request.processInputs()
@@ -502,6 +503,7 @@
dict(REQUEST_METHOD='POST',
CONTENT_TYPE=('application/x-www-form-urlencoded'
'; charset=UTF-8'),
+ QUERY_STRING='',
),
'x=1&y=2')
request.processInputs()
More information about the Checkins
mailing list