[Checkins] SVN: z3c.optionstorage/trunk/s Do not use zope.app.zapi or zope.deprecation

[Gediminas Paulauskas]

Log message for revision 109097:
  Do not use zope.app.zapi or zope.deprecation
  

Changed:
  U   z3c.optionstorage/trunk/setup.py
  U   z3c.optionstorage/trunk/src/z3c/optionstorage/__init__.py
  U   z3c.optionstorage/trunk/src/z3c/optionstorage/browser/__init__.py
  U   z3c.optionstorage/trunk/src/z3c/optionstorage/vocabulary.py

-=-
Modified: z3c.optionstorage/trunk/setup.py
===================================================================
--- z3c.optionstorage/trunk/setup.py	2010-02-17 16:38:03 UTC (rev 109096)
+++ z3c.optionstorage/trunk/setup.py	2010-02-17 20:37:26 UTC (rev 109097)
@@ -53,16 +53,15 @@
                           'zope.annotation',
                           'zope.component',
                           'zope.configuration',
-                          'zope.deprecation',
                           'zope.i18n',
                           'zope.interface',
                           'zope.proxy',
                           'zope.schema',
                           'zope.security',
+                          'zope.traversing',
                           'zope.app.pagetemplate',
                           'zope.app.publisher',
-                          'zope.app.form',
-                          'zope.app.zapi'],
+                          'zope.app.form'],
       include_package_data = True,
       zip_safe = False,
       )

Modified: z3c.optionstorage/trunk/src/z3c/optionstorage/__init__.py
===================================================================
--- z3c.optionstorage/trunk/src/z3c/optionstorage/__init__.py	2010-02-17 16:38:03 UTC (rev 109096)
+++ z3c.optionstorage/trunk/src/z3c/optionstorage/__init__.py	2010-02-17 20:37:26 UTC (rev 109097)
@@ -15,7 +15,7 @@
 from zope.annotation.interfaces import IAnnotatable, IAnnotations
 from zope.proxy import removeAllProxies
 from zope.interface import implements
-from zope.app import zapi
+from zope.traversing.api import getParents
 
 from persistent.dict import PersistentDict
 from persistent import Persistent
@@ -194,7 +194,7 @@
             self.data = annotations[OptionStorageKey] = PersistentDict()
 
 def queryOptionStorage(context, name):
-    lookuplist = zapi.getParents(context)
+    lookuplist = getParents(context)
     lookuplist.insert(0, context)
     for object in lookuplist:
         object = removeAllProxies(object)

Modified: z3c.optionstorage/trunk/src/z3c/optionstorage/browser/__init__.py
===================================================================
--- z3c.optionstorage/trunk/src/z3c/optionstorage/browser/__init__.py	2010-02-17 16:38:03 UTC (rev 109096)
+++ z3c.optionstorage/trunk/src/z3c/optionstorage/browser/__init__.py	2010-02-17 20:37:26 UTC (rev 109097)
@@ -11,7 +11,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import zope.deprecation
 
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from z3c.optionstorage.interfaces import IOptionStorage

Modified: z3c.optionstorage/trunk/src/z3c/optionstorage/vocabulary.py
===================================================================
--- z3c.optionstorage/trunk/src/z3c/optionstorage/vocabulary.py	2010-02-17 16:38:03 UTC (rev 109096)
+++ z3c.optionstorage/trunk/src/z3c/optionstorage/vocabulary.py	2010-02-17 20:37:26 UTC (rev 109097)
@@ -14,13 +14,12 @@
 from zope.schema.interfaces import IVocabularyTokenized
 from zope.schema.vocabulary import SimpleTerm
 from zope.interface import implements
-from zope.app import zapi
 
 from zope.security.management import getInteraction
 from zope.i18n.negotiator import negotiator
 
-from z3c.optionstorage.interfaces import IOptionStorage, IOptionStorageVocabulary
-from z3c.optionstorage import OptionStorageKey, queryOptionStorage
+from z3c.optionstorage.interfaces import IOptionStorageVocabulary
+from z3c.optionstorage import queryOptionStorage
 
 
 class OptionStorageVocabulary(object):