[z3-checkins] r33687 - in z3/sqlos/trunk/src/sqlos: . interfaces

[jinty at codespeak.net]

Author: jinty
Date: Tue Oct 24 21:14:00 2006
New Revision: 33687

Modified:
   z3/sqlos/trunk/src/sqlos/README.txt
   z3/sqlos/trunk/src/sqlos/container.py
   z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
   z3/sqlos/trunk/src/sqlos/interfaces/container.py
Log:
more zope.app deprecation and a stray content directive.

Modified: z3/sqlos/trunk/src/sqlos/README.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/README.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/README.txt	Tue Oct 24 21:14:00 2006
@@ -361,7 +361,7 @@
 
 Finally, write the ZCML configuration to put all the pieces together::
 
-  <content class="myproject.PersonContainer">
+  <class class="myproject.PersonContainer">
 
     <implements interface="zope.app.container.interfaces.IContentContainer" />
 
@@ -422,7 +422,7 @@
 
 The code is as follows::
 
-    >>> from zope.app.dublincore.interfaces import IZopeDublinCore
+    >>> from zope.dublincore.interfaces import IZopeDublinCore
 
     >>> class PersonDublinCore(object):
     ...     """An adapter providing DublinCore metadata for IPerson objects"""
@@ -441,7 +441,7 @@
 
 
       <adapter
-          provides="zope.app.dublincore.interfaces.IZopeDublinCore"
+          provides="zope.dublincore.interfaces.IZopeDublinCore"
           for="myproject.interfaces.IPerson"
           factory="myproject.PersonDublinCore"
           trusted="true"

Modified: z3/sqlos/trunk/src/sqlos/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/container.py	Tue Oct 24 21:14:00 2006
@@ -23,9 +23,9 @@
 from zope.app.container.contained import Contained
 from zope.app.container.contained import NameChooser
 from zope.app.container.constraints import checkFactory
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
 from zope.proxy import sameProxiedObjects
-from zope.app.exception.interfaces import UserError
+from zope.exceptions.interfaces import UserError
 
 from sqlos.interfaces import ISQLObject, ISQLObjectIsolated, IISQLObject
 from sqlos.interfaces.container import ISQLObjectContainer

Modified: z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	Tue Oct 24 21:14:00 2006
@@ -15,7 +15,7 @@
 from zope.security.checker import NamesChecker, NoProxy, defineChecker
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.schema import Choice, List
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from sqlobject import NoDefault
 from sqlobject.dbconnection import DBConnection, DBAPI
 from sqlobject import _mysql, _postgres, _sybase

Modified: z3/sqlos/trunk/src/sqlos/interfaces/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/interfaces/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/interfaces/container.py	Tue Oct 24 21:14:00 2006
@@ -11,7 +11,7 @@
 """
 from zope.interface import Attribute
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContainerNamesContainer
 from zope.app.container.interfaces import IReadContainer, IContainer