[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Merge 3.3-zope.app.externals branch.

Tres Seaver tseaver at palladion.com
Wed Jul 5 17:29:45 EDT 2006


Log message for revision 68990:
  Merge 3.3-zope.app.externals branch.

Changed:
  A   Zope3/trunk/src/zope/app/content_types/
  D   Zope3/trunk/src/zope/app/content_types.py
  A   Zope3/trunk/src/zope/app/datetimeutils/
  D   Zope3/trunk/src/zope/app/datetimeutils.py
  A   Zope3/trunk/src/zope/app/decorator/
  D   Zope3/trunk/src/zope/app/decorator.py
  A   Zope3/trunk/src/zope/app/layers/
  D   Zope3/trunk/src/zope/app/layers.py
  A   Zope3/trunk/src/zope/app/servicenames/
  D   Zope3/trunk/src/zope/app/servicenames.py
  A   Zope3/trunk/src/zope/app/skins/
  D   Zope3/trunk/src/zope/app/skins.py
  A   Zope3/trunk/src/zope/app/timezones/
  D   Zope3/trunk/src/zope/app/timezones.py

-=-
Copied: Zope3/trunk/src/zope/app/content_types (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/content_types)

Deleted: Zope3/trunk/src/zope/app/content_types.py
===================================================================
--- Zope3/trunk/src/zope/app/content_types.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/content_types.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,7 +0,0 @@
-# This module has moved to zope.contenttype
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.contenttype',
-    "Zope 3.5",
-    )

Copied: Zope3/trunk/src/zope/app/datetimeutils (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/datetimeutils)

Deleted: Zope3/trunk/src/zope/app/datetimeutils.py
===================================================================
--- Zope3/trunk/src/zope/app/datetimeutils.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/datetimeutils.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,7 +0,0 @@
-# This module has moved to zope.datetime
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.datetime',
-    "Zope 3.5",
-    )

Copied: Zope3/trunk/src/zope/app/decorator (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/decorator)

Deleted: Zope3/trunk/src/zope/app/decorator.py
===================================================================
--- Zope3/trunk/src/zope/app/decorator.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/decorator.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,7 +0,0 @@
-# This module has moved to zope.decorator
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.decorator',
-    "Zope 3.5",
-    )

Copied: Zope3/trunk/src/zope/app/layers (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/layers)

Deleted: Zope3/trunk/src/zope/app/layers.py
===================================================================
--- Zope3/trunk/src/zope/app/layers.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/layers.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,30 +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.
-#
-##############################################################################
-"""Convenience module to access registered layers
-
-This module solely exists for backward compatibility reasons.  It is
-to be removed by Zope 3.5.  The now deprecated browser:layers
-directive puts a reference to the created interfaces in this module.
-
-BBB 2006/02/18, to be removed after 12 months
-
-$Id$
-"""
-import zope.deprecation
-
-def set(name, obj):
-    globals()[name] = obj
-    zope.deprecation.deprecated(name, "The zope.app.layers module has "
-                                "been deprecated and will be removed in "
-                                "Zope 3.5.")

Copied: Zope3/trunk/src/zope/app/servicenames (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/servicenames)

Deleted: Zope3/trunk/src/zope/app/servicenames.py
===================================================================
--- Zope3/trunk/src/zope/app/servicenames.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/servicenames.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,27 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 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.
-#
-##############################################################################
-"""Default service names
-
-$Id$
-"""
-import warnings
-warnings.warn("This module is deprecated and will go away in Zope 3.5.",
-              DeprecationWarning, 2)
-
-from zope.component.servicenames import *
-
-Authentication = 'Authentication'
-BrowserMenu = 'BrowserMenu'
-ErrorLogging = 'ErrorLogging'
-PrincipalAnnotation = 'PrincipalAnnotation'

Copied: Zope3/trunk/src/zope/app/skins (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/skins)

Deleted: Zope3/trunk/src/zope/app/skins.py
===================================================================
--- Zope3/trunk/src/zope/app/skins.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/skins.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,30 +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.
-#
-##############################################################################
-"""Convenience module to access registered skins
-
-This module solely exists for backward compatibility reasons.  It is
-to be removed by Zope 3.5.  The now deprecated browser:skin directive
-puts a reference to the created interfaces in this module.
-
-BBB 2006/02/18, to be removed after 12 months
-
-$Id$
-"""
-import zope.deprecation
-
-def set(name, obj):
-    globals()[name] = obj
-    zope.deprecation.deprecated(name, "The zope.app.skins module has "
-                                "been deprecated and will be removed in "
-                                "Zope 3.5.")

Copied: Zope3/trunk/src/zope/app/timezones (from rev 68856, Zope3/branches/3.3-zope.app.externals/src/zope/app/timezones)

Deleted: Zope3/trunk/src/zope/app/timezones.py
===================================================================
--- Zope3/trunk/src/zope/app/timezones.py	2006-07-05 21:21:49 UTC (rev 68989)
+++ Zope3/trunk/src/zope/app/timezones.py	2006-07-05 21:29:44 UTC (rev 68990)
@@ -1,7 +0,0 @@
-# This module has moved to zope.datetime.timezones
-# and will go away in Zope 3.5
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.datetime.timezones',
-    "Zope 3.5",
-    )



More information about the Zope3-Checkins mailing list