[Zope3-checkins] CVS: Zope3/src/zope/app/index/field - configure.zcml:1.1.16.1 index.py:1.3.10.2

[Albertas Agejevas]

Update of /cvs-repository/Zope3/src/zope/app/index/field
In directory cvs.zope.org:/tmp/cvs-serv16963/src/zope/app/index/field

Modified Files:
      Tag: cw-mail-branch
	configure.zcml index.py 
Log Message:
One more sync with HEAD.

=== Zope3/src/zope/app/index/field/configure.zcml 1.1 => 1.1.16.1 ===
--- Zope3/src/zope/app/index/field/configure.zcml:1.1	Wed Mar 26 11:00:14 2003
+++ Zope3/src/zope/app/index/field/configure.zcml	Mon Jun 23 10:20:05 2003
@@ -5,13 +5,8 @@
   <require
       permission="zope.ManageServices"
       interface="zope.app.interfaces.index.field.IUIFieldIndex"
-      attributes="query"
       />
 
-  <factory
-      id="zope.app.index.field.FieldIndex"
-      permission="zope.ManageServices"
-      />
   <implements
       interface="zope.app.interfaces.services.query.IQueryProcessable"
       />


=== Zope3/src/zope/app/index/field/index.py 1.3.10.1 => 1.3.10.2 ===
--- Zope3/src/zope/app/index/field/index.py:1.3.10.1	Sun Jun 22 10:23:08 2003
+++ Zope3/src/zope/app/index/field/index.py	Mon Jun 23 10:20:05 2003
@@ -34,7 +34,7 @@
      IObjectUnregisteredHubEvent, \
      IObjectModifiedHubEvent
 
-from zope.app.interfaces.index.field  import IUIFieldIndex
+from zope.app.interfaces.index.field import IUIFieldIndex
 
 class FieldIndex(FieldIndexWrapper):
 
@@ -50,7 +50,7 @@
         value = getattr(object, self._indexed_attr, None)
         if value is None: return None
 
-        if callable(value): 
+        if callable(value):
             try: value = value()
             except: return None