[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/ Changed
the way modules are moved:
Jim Fulton
jim at zope.com
Sat Apr 22 14:53:23 EDT 2006
Log message for revision 67275:
Changed the way modules are moved:
- Removed the deprecatedModule API. It didn't really work. It
created a proxies for deprecated modules in sys.modules that
generated warnings when names were accessed. Unfortunately, there
many analysis systems that inspect all modules found sys.modules.
When one os these hit a deprecated module, it generated spurious
deprecation warnings
- Added a new API to zope.deprecation to be used on placeholders for
moved modules in their old locations. With this approach, moved
modules only generate warnings when they are actually imported.
- Added placeholders for various modiles moved out of zope.app.
When we are ready to really get rid of these, we'll just remove the
placeholders.
Changed:
U Zope3/branches/jim-adapter/src/zope/app/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/annotation/
A Zope3/branches/jim-adapter/src/zope/app/annotation/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/annotation/attribute.py
A Zope3/branches/jim-adapter/src/zope/app/annotation/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/component/interface.py
A Zope3/branches/jim-adapter/src/zope/app/content_types.py
A Zope3/branches/jim-adapter/src/zope/app/copypastemove/
A Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/copypastemove/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/datetimeutils.py
A Zope3/branches/jim-adapter/src/zope/app/decorator.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/
A Zope3/branches/jim-adapter/src/zope/app/dublincore/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/dcsv.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py
A Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py
A Zope3/branches/jim-adapter/src/zope/app/event/dispatch.py
A Zope3/branches/jim-adapter/src/zope/app/event/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py
A Zope3/branches/jim-adapter/src/zope/app/event/tests/placelesssetup.py
A Zope3/branches/jim-adapter/src/zope/app/filerepresentation/
A Zope3/branches/jim-adapter/src/zope/app/filerepresentation/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/filerepresentation/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/i18n/tests/placelesssetup.py
A Zope3/branches/jim-adapter/src/zope/app/location/
A Zope3/branches/jim-adapter/src/zope/app/location/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/location/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/location/pickling.py
A Zope3/branches/jim-adapter/src/zope/app/location/traversing.py
A Zope3/branches/jim-adapter/src/zope/app/mail/
A Zope3/branches/jim-adapter/src/zope/app/mail/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py
A Zope3/branches/jim-adapter/src/zope/app/mail/event.py
A Zope3/branches/jim-adapter/src/zope/app/mail/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py
A Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py
A Zope3/branches/jim-adapter/src/zope/app/rdb/
A Zope3/branches/jim-adapter/src/zope/app/rdb/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/rdb/browser.py
A Zope3/branches/jim-adapter/src/zope/app/rdb/gadfly.py
A Zope3/branches/jim-adapter/src/zope/app/rdb/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/security/adapter.py
A Zope3/branches/jim-adapter/src/zope/app/security/fields.py
A Zope3/branches/jim-adapter/src/zope/app/size/
A Zope3/branches/jim-adapter/src/zope/app/size/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/size/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/timezones.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/
A Zope3/branches/jim-adapter/src/zope/app/traversing/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/api.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/browser/
A Zope3/branches/jim-adapter/src/zope/app/traversing/browser/__init__.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/browser/absoluteurl.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/browser/interfaces.py
A Zope3/branches/jim-adapter/src/zope/app/traversing/interfaces.py
U Zope3/branches/jim-adapter/src/zope/deferredimport/README.txt
U Zope3/branches/jim-adapter/src/zope/deferredimport/__init__.py
U Zope3/branches/jim-adapter/src/zope/deferredimport/deferredmodule.py
U Zope3/branches/jim-adapter/src/zope/deprecation/README.txt
U Zope3/branches/jim-adapter/src/zope/deprecation/__init__.py
U Zope3/branches/jim-adapter/src/zope/deprecation/deprecation.py
U Zope3/branches/jim-adapter/src/zope/deprecation/tests.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -15,82 +15,4 @@
$Id$
"""
-##############################################################################
-# BBB 2006/04/03 -- to be removed after 12 months
-from zope.deferredimport import deprecatedModule
-
-modules_aliases_35 = {
- 'zope.app.copypastemove': 'zope.copypastemove',
- 'zope.app.copypastemove.interfaces': 'zope.copypastemove.interfaces',
-
- 'zope.app.decorator': 'zope.decorator',
- 'zope.app.component.interface': 'zope.component.interface',
- 'zope.app.content_types': 'zope.contenttype',
- 'zope.app.datetimeutils': 'zope.datetime',
- 'zope.app.timezones': 'zope.datetime.timezones',
- 'zope.app.i18n.tests.placelesssetup': 'zope.i18n.testing',
-
- 'zope.app.mail': 'zope.sendmail',
- 'zope.app.mail.event': 'zope.sendmail.event',
- 'zope.app.mail.maildir': 'zope.sendmail.maildir',
- 'zope.app.mail.delivery': 'zope.sendmail.delivery',
- 'zope.app.mail.interfaces': 'zope.sendmail.interfaces',
- 'zope.app.mail.vocabulary': 'zope.sendmail.vocabulary',
-
- 'zope.app.rdb': 'zope.rdb',
- 'zope.app.rdb.interfaces': 'zope.rdb.interfaces',
- 'zope.app.rdb.browser': 'zope.rdb.browser',
- 'zope.app.rdb.gadfly': 'zope.rdb.gadfly',
-
- 'zope.app.size': 'zope.size',
- 'zope.app.size.interfaces': 'zope.size.interfaces',
-
- 'zope.app.traversing': 'zope.traversing',
- 'zope.app.traversing.adapters': 'zope.traversing.adapters',
- 'zope.app.traversing.api': 'zope.traversing.api',
- 'zope.app.traversing.interfaces': 'zope.traversing.interfaces',
- 'zope.app.traversing.browser': 'zope.traversing.browser',
- 'zope.app.traversing.browser.absoluteurl':
- 'zope.traversing.browser.absoluteurl',
- 'zope.app.traversing.browser.interfaces':
- 'zope.traversing.browser.absoluteurl',
-
- 'zope.app.location': 'zope.location',
- 'zope.app.location.interfaces': 'zope.location.interfaces',
- 'zope.app.location.pickling': 'zope.location.pickling',
- 'zope.app.locatin.traversing': 'zope.location.traversing',
-
- 'zope.app.annotation': 'zope.annotation',
- 'zope.app.annotation.attribute': 'zope.annotation.attribute',
- 'zope.app.annotation.interfaces': 'zope.annotation.interfaces',
-
- 'zope.app.dublincore': 'zope.dublincore',
- 'zope.app.dublincore.interfaces': 'zope.dublincore.interfaces',
- 'zope.app.dublincore.annotatableadapter':
- 'zope.dublincore.annotatableadapter',
- 'zope.app.dublincore.creatorannotator': 'zope.dublincore.creatorannotator',
- 'zope.app.dublincore.dcsv': 'zope.dublincore.dcsv',
- 'zope.app.dublincore.dcterms': 'zope.dublincore.dcterms',
- 'zope.app.dublincore.timeannotators': 'zope.dublincore.timeannotators',
- 'zope.app.dublincore.xmlmetadata': 'zope.dublincore.xmlmetadata',
- 'zope.app.dublincore.zopedublincore': 'zope.dublincore.zopedublincore',
-
- 'zope.app.event.objectevent': 'zope.lifecycleevent',
- 'zope.app.event.interfaces': 'zope.lifecycleevent.interfaces',
- 'zope.app.event.dispatch': 'zope.component.event',
- 'zope.app.event.tests.placelesssetup': 'zope.component.testing',
-
- 'zope.app.filerepresentation': 'zope.filerepresentation',
- 'zope.app.filerepresentation.interfaces':
- 'zope.filerepresentation.interfaces',
-
- 'zope.app.security.adapter': 'zope.security.adapter',
- 'zope.app.security.fields': 'zope.security.zcml',
- }
-
-msg_35 = "%s has been moved to %s. This alias will be removed in Zope 3.5."
-for old, new in modules_aliases_35.iteritems():
- deprecatedModule(old, new, msg_35 % (old, new))
-
-##############################################################################
Added: Zope3/branches/jim-adapter/src/zope/app/annotation/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/annotation/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/annotation/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.annotation
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.annotation',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/annotation/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/annotation/attribute.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/annotation/attribute.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/annotation/attribute.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.annotation.attribute
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.annotation.attribute',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/annotation/attribute.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/annotation/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/annotation/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/annotation/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.annotation.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.annotation.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/annotation/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/component/interface.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/interface.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/component/interface.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.component.interface
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.component.interface',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/component/interface.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/content_types.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/content_types.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/content_types.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# 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",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/content_types.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.copypastemove
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.copypastemove',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/copypastemove/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.copypastemove.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.copypastemove.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/copypastemove/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/datetimeutils.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/datetimeutils.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/datetimeutils.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# 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",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/datetimeutils.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/decorator.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/decorator.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/decorator.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# 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",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/decorator.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.annotatableadapter
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.annotatableadapter',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.creatorannotator
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.creatorannotator',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/dcsv.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/dcsv.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/dcsv.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.dcsv
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.dcsv',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/dcsv.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.dcterms
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.dcterms',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.timeannotators
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.timeannotators',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.xmlmetadata
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.xmlmetadata',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.dublincore.zopedublincore
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.dublincore.zopedublincore',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/event/dispatch.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/dispatch.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/event/dispatch.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.component.event
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.component.event',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/event/dispatch.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/event/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/event/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.lifecycleevent.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.lifecycleevent.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/event/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.lifecycleevent
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.lifecycleevent',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/event/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/tests/placelesssetup.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/event/tests/placelesssetup.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.component.testing
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.component.testing',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/event/tests/placelesssetup.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/filerepresentation/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/filerepresentation/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/filerepresentation/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.filerepresentation
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.filerepresentation',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/filerepresentation/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/filerepresentation/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/filerepresentation/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/filerepresentation/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.filerepresentation.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.filerepresentation.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/filerepresentation/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/i18n/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/i18n/tests/placelesssetup.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/i18n/tests/placelesssetup.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.i18n.testing
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.i18n.testing',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/i18n/tests/placelesssetup.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/location/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/location/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/location/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.location
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.location',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/location/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/location/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/location/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/location/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.location.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.location.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/location/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/location/pickling.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/location/pickling.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/location/pickling.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.location.pickling
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.location.pickling',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/location/pickling.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/location/traversing.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/location/traversing.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/location/traversing.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.location.traversing
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.location.traversing',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/location/traversing.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail.delivery
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail.delivery',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/delivery.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/event.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/event.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/event.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail.event
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail.event',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/event.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail.maildir
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail.maildir',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/maildir.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.sendmail.vocabulary
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.sendmail.vocabulary',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/mail/vocabulary.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/rdb/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/rdb/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/rdb/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.rdb
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.rdb',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/rdb/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/rdb/browser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/rdb/browser.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/rdb/browser.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.rdb.browser
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.rdb.browser',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/rdb/browser.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/rdb/gadfly.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/rdb/gadfly.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/rdb/gadfly.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.rdb.gadfly
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.rdb.gadfly',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/rdb/gadfly.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/rdb/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/rdb/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/rdb/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.rdb.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.rdb.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/rdb/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/security/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/adapter.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/security/adapter.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.security.adapter
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.security.adapter',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/security/adapter.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/security/fields.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/fields.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/security/fields.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.security.zcml
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.security.zcml',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/security/fields.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/size/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/size/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/size/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.size
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.size',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/size/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/size/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/size/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/size/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.size.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.size.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/size/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/timezones.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/timezones.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/timezones.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# 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",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/timezones.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.adapters
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.adapters',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/api.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/api.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/api.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.api
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.api',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/api.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/browser/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/browser/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.browser
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.browser',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/__init__.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/absoluteurl.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/browser/absoluteurl.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/browser/absoluteurl.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.browser.absoluteurl
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.browser.absoluteurl',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/absoluteurl.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/browser/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/browser/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.browser.absoluteurl
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.browser.absoluteurl',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/browser/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: Zope3/branches/jim-adapter/src/zope/app/traversing/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/interfaces.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/interfaces.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -0,0 +1,7 @@
+# This module has moved to zope.traversing.interfaces
+# and will go away in Zope 3.5
+import zope.deprecation
+zope.deprecation.moved(
+ 'zope.traversing.interfaces',
+ "Zope 3.5",
+ )
Property changes on: Zope3/branches/jim-adapter/src/zope/app/traversing/interfaces.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: Zope3/branches/jim-adapter/src/zope/deferredimport/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deferredimport/README.txt 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deferredimport/README.txt 2006-04-22 18:53:22 UTC (rev 67275)
@@ -283,41 +283,3 @@
Note, as in the example above, that you can make multiple
deferred-import calls in a module.
-
-Deprecated Module Aliases
--------------------------
-
-Sometimes modules are renamed and they should be available under the
-old name for a little while. Importing things from the old name,
-however, should generate deprecation warnings. Such deferred and
-deprecated module aliases are installed using ``deprecatedModule``.
-This convenience function takes the old module name, the new one and a
-deprecation message:
-
- >>> from zope.deferredimport import deprecatedModule
- >>> deprecatedModule('deferredsample', 'zope.deferredimport',
- ... 'deferredsample has been renamed to zope.deferredimport.')
-
-We can now import things from the "old" location:
-
- >>> from deferredsample import deprecated
- ... doctest: +NORMALIZE_WHITESPACE
- zope/deferredimport/README.txt:1: DeprecationWarning:
- deferredsample has been renamed to zope.deferredimport.
- Deferred Import
-
-The deprecation warning won't be shown a second time:
-
- >>> from deferredsample import deprecatedFrom
-
-The deprecated module alias works pretty much like a regular module.
-Of course, all of its information points to the original, for example:
-
- >>> import deferredsample
- >>> deferredsample.__name__
- 'zope.deferredimport'
-
-Before we end this, we should clean up:
-
- >>> import sys
- >>> del sys.modules['deferredsample']
Modified: Zope3/branches/jim-adapter/src/zope/deferredimport/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deferredimport/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deferredimport/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -1,4 +1,3 @@
from zope.deferredimport.deferredmodule import initialize
from zope.deferredimport.deferredmodule import define, defineFrom
from zope.deferredimport.deferredmodule import deprecated, deprecatedFrom
-from zope.deferredimport.deferredmodule import deprecatedModule
Modified: Zope3/branches/jim-adapter/src/zope/deferredimport/deferredmodule.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deferredimport/deferredmodule.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deferredimport/deferredmodule.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -111,29 +111,3 @@
specifier = from_name + ':' + name
__deferred_definitions__[name] = DeferredAndDeprecated(
name, specifier, message)
-
-class DeferredDeprecatedModule(object):
- __slots__ = ('__module_name', '__message', '__orig_module')
-
- def __init__(self, module_name, message):
- self.__module_name = module_name
- self.__message = message
- self.__orig_module = None
-
- def __getattribute__(self, name):
- if name.startswith('_DeferredDeprecatedModule__'):
- return object.__getattribute__(self, name)
-
- if self.__orig_module is None:
- self.__orig_module = __import__(
- self.__module_name, {}, {}, ['*'])
- warnings.warn(self.__message, DeprecationWarning, 2)
- return getattr(self.__orig_module, name)
-
- def __setattr__(self, name, value):
- if name.startswith('_DeferredDeprecatedModule__'):
- return object.__setattr__(self, name, value)
- setattr(self.__orig_module, name, value)
-
-def deprecatedModule(old, new, message):
- sys.modules[old] = DeferredDeprecatedModule(new, message)
Modified: Zope3/branches/jim-adapter/src/zope/deprecation/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deprecation/README.txt 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deprecation/README.txt 2006-04-22 18:53:22 UTC (rev 67275)
@@ -147,6 +147,56 @@
>>> del deprecated
>>> del sys.modules['zope.wanda']
+Moving modules
+--------------
+
+When a module is moved, you often want to support importing from the
+old location for a while, generating a deprecation warning when
+someone uses the old location. This can be done using the moved
+function.
+
+To see how this works, we'll use a helper function to create two fake
+modules in the zope.deprecation package. First will create a module
+in the "old" location that used the moved function to indicate the a
+module on the new location should be used:
+
+ >>> create_module(old_location=
+ ... '''
+ ... import zope.deprecation
+ ... zope.deprecation.moved('zope.deprecation.new_location', 'version 2')
+ ... ''')
+
+and we define the module in the new location:
+
+ >>> create_module(new_location=
+ ... '''\
+ ... print "new module imported"
+ ... x = 42
+ ... ''')
+
+Now, if we import the old location, we'll see the output of importing
+the old location:
+
+ >>> import zope.deprecation.old_location
+ ... # doctest: +NORMALIZE_WHITESPACE
+ From tests.py's showwarning():
+ ...zope/deprecation/README.txt:1:
+ DeprecationWarning: zope.deprecation.old_location has moved to
+ zope.deprecation.new_location.
+ Import of zope.deprecation.old_location will become unsupported
+ in version 2
+ ===============
+ new module imported
+
+ >>> zope.deprecation.old_location.x
+ 42
+
+and the old module will be an alias for the new:
+
+ >>> (sys.modules['zope.deprecation.old_location']
+ ... is sys.modules['zope.deprecation.new_location'])
+ True
+
Temporarily turning off deprecation warnings
--------------------------------------------
Modified: Zope3/branches/jim-adapter/src/zope/deprecation/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deprecation/__init__.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deprecation/__init__.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -18,6 +18,7 @@
__docformat__ = "reStructuredText"
from zope.deprecation.deprecation import deprecated, deprecate, ShowSwitch
+from zope.deprecation.deprecation import moved
# This attribute can be used to temporarly deactivate deprecation
# warnings, so that backward-compatibility code can import other
Modified: Zope3/branches/jim-adapter/src/zope/deprecation/deprecation.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deprecation/deprecation.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deprecation/deprecation.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -193,3 +193,14 @@
def __call__(self, func):
return DeprecatedMethod(func, self.msg)
+
+def moved(to_location, unsupported_in=None):
+ old = sys._getframe(1).f_globals['__name__']
+ message = '%s has moved to %s.' % (old, to_location)
+ if unsupported_in:
+ message += " Import of %s will become unsupported in %s" % (
+ old, unsupported_in)
+
+ warnings.warn(message, DeprecationWarning, 3)
+ __import__(to_location)
+ sys.modules[old] = sys.modules[to_location]
Modified: Zope3/branches/jim-adapter/src/zope/deprecation/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/deprecation/tests.py 2006-04-22 15:02:34 UTC (rev 67274)
+++ Zope3/branches/jim-adapter/src/zope/deprecation/tests.py 2006-04-22 18:53:22 UTC (rev 67275)
@@ -15,10 +15,15 @@
$Id$
"""
+
+import os
+import shutil
import sys
+import tempfile
import unittest
import warnings
from zope.testing import doctest
+import zope.deprecation
# Used in doctests
from deprecation import deprecated
@@ -54,11 +59,35 @@
line.strip(),
)
+
+def setUpCreateModule(test):
+ d = test.globs['tmp_d'] = tempfile.mkdtemp('deprecation')
+
+ def create_module(**modules):
+ for name, src in modules.iteritems():
+ f = open(os.path.join(d, name+'.py'), 'w')
+ f.write(src)
+ f.close()
+ test.globs['created_modules'].append(name)
+
+ test.globs['created_modules'] = []
+ test.globs['create_module'] = create_module
+
+ zope.deprecation.__path__.append(d)
+
+def tearDownCreateModule(test):
+ zope.deprecation.__path__.pop()
+ shutil.rmtree(test.globs['tmp_d'])
+ for name in test.globs['created_modules']:
+ sys.modules.pop(name, None)
+
def setUp(test):
test.globs['saved_warn'] = warnings.warn
warnings.warn = warn
+ setUpCreateModule(test)
def tearDown(test):
+ tearDownCreateModule(test)
warnings.warn = test.globs['saved_warn']
del object.__getattribute__(sys.modules['zope.deprecation.tests'],
'_DeprecationProxy__deprecated')['demo4']
More information about the Zope3-Checkins
mailing list