[Checkins] SVN: zope3org/trunk/src/zorg/table/ fixed deprecated warnings

[Stefan Martin]

Log message for revision 75768:
  fixed deprecated warnings

Changed:
  U   zope3org/trunk/src/zorg/table/browser/metaconfigure.py
  U   zope3org/trunk/src/zorg/table/browser/metadirectives.py
  U   zope3org/trunk/src/zorg/table/container/configure.zcml
  U   zope3org/trunk/src/zorg/table/metadirectives.py

-=-
Modified: zope3org/trunk/src/zorg/table/browser/metaconfigure.py
===================================================================
--- zope3org/trunk/src/zorg/table/browser/metaconfigure.py	2007-05-15 15:28:11 UTC (rev 75767)
+++ zope3org/trunk/src/zorg/table/browser/metaconfigure.py	2007-05-15 15:38:15 UTC (rev 75768)
@@ -1,19 +1,14 @@
+
 import os
 import zope
 
-
-from zope.configuration import config, xmlconfig, fields
+from zope.interface import implements 
+from zope.configuration import config
+from zope.configuration.exceptions import ConfigurationError
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.interface import implements, Interface
-from zope.app.publisher.browser import viewmeta
-from zope.app.component.metaconfigure import utility
-from zope.app.component import metaconfigure
-from zope.app.publisher.interfaces.browser import IBrowserView
+
 from zope.app.pagetemplate.engine import TrustedEngine
-from zope.configuration.exceptions import ConfigurationError
-from zope.security import checker
-from zope.security.checker import CheckerPublic
 
 from zorg.table.interfaces import ICell, IRow, ITableAction, ITableFilter
 

Modified: zope3org/trunk/src/zorg/table/browser/metadirectives.py
===================================================================
--- zope3org/trunk/src/zorg/table/browser/metadirectives.py	2007-05-15 15:28:11 UTC (rev 75767)
+++ zope3org/trunk/src/zorg/table/browser/metadirectives.py	2007-05-15 15:38:15 UTC (rev 75768)
@@ -1,10 +1,9 @@
 
 from zope.interface import Interface
-from zope.configuration.fields import GlobalObject,PythonIdentifier
-from zope.configuration.fields import GlobalInterface,Tokens,Path,Bool
-from zope.app.security.fields import Permission
-from zope.app.component.fields import LayerField
-from zope.schema import TextLine,Id,Bool, Choice
+from zope.configuration.fields import GlobalObject
+from zope.configuration.fields import GlobalInterface, Path
+from zope.security.zcml import Permission
+from zope.schema import TextLine, Bool, Choice
 from zope.schema.vocabulary import SimpleVocabulary
 
 
@@ -36,7 +35,7 @@
         required=True
         )
 
-    layer = LayerField(
+    layer = GlobalInterface(
         title=u"Layer",
         description=u"The later the view is in. Default: 'default'",
         required=False

Modified: zope3org/trunk/src/zorg/table/container/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/table/container/configure.zcml	2007-05-15 15:28:11 UTC (rev 75767)
+++ zope3org/trunk/src/zorg/table/container/configure.zcml	2007-05-15 15:38:15 UTC (rev 75768)
@@ -3,7 +3,7 @@
            xmlns:i18n="http://namespaces.zope.org/i18n"
            i18n_domain="zope">
 
- <adapter for="zope.app.location.interfaces.ILocation"
+ <adapter for="zope.location.interfaces.ILocation"
           factory=".adapters.MovableLocation"
           provides=".interfaces.IMovableLocation"/>
 
@@ -69,19 +69,19 @@
         />
     <column
         name="title" title="Title"
-        schema="zope.app.dublincore.interfaces.IZopeDublinCore"
+        schema="zope.dublincore.interfaces.IZopeDublinCore"
         />
     <column
         name="size" title="Size" field="sizeForSorting"
-        schema="zope.app.size.interfaces.ISized"
+        schema="zope.size.interfaces.ISized"
         />
     <column
         name="modified" title="Modified"
-        schema="zope.app.dublincore.interfaces.IZopeDublinCore"
+        schema="zope.dublincore.interfaces.IZopeDublinCore"
         /> 
     <column
         name="created" title="Created"
-        schema="zope.app.dublincore.interfaces.IZopeDublinCore"
+        schema="zope.dublincore.interfaces.IZopeDublinCore"
         />
   </tableconfig>
 

Modified: zope3org/trunk/src/zorg/table/metadirectives.py
===================================================================
--- zope3org/trunk/src/zorg/table/metadirectives.py	2007-05-15 15:28:11 UTC (rev 75767)
+++ zope3org/trunk/src/zorg/table/metadirectives.py	2007-05-15 15:38:15 UTC (rev 75768)
@@ -1,10 +1,8 @@
 
-from zope.configuration.fields import GlobalInterface,Tokens,Path,Bool
 from zope.interface import Interface
-from zope.configuration.fields import GlobalObject,PythonIdentifier,Tokens
 from zope.schema import TextLine, Int, Id
-from zope.app.security.fields import Permission
-from interfaces import IColumn
+from zope.configuration.fields import GlobalInterface, Tokens, Bool
+from zope.security.zcml import Permission
 
 
 class IColumnDirective(Interface):