[Checkins] SVN: z3c.searcher/trunk/ Remove unneeded dependencies. Change package's mailing list address to zope-dev.

[Dan Korostelev]

Log message for revision 97046:
  Remove unneeded dependencies. Change package's mailing list address to zope-dev.

Changed:
  U   z3c.searcher/trunk/CHANGES.txt
  U   z3c.searcher/trunk/setup.py
  U   z3c.searcher/trunk/src/z3c/searcher/README.txt
  U   z3c.searcher/trunk/src/z3c/searcher/criterium.py
  U   z3c.searcher/trunk/src/z3c/searcher/form.py
  U   z3c.searcher/trunk/src/z3c/searcher/interfaces.py
  U   z3c.searcher/trunk/src/z3c/searcher/table.py
  U   z3c.searcher/trunk/src/z3c/searcher/testing.py

-=-
Modified: z3c.searcher/trunk/CHANGES.txt
===================================================================
--- z3c.searcher/trunk/CHANGES.txt	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/CHANGES.txt	2009-02-22 15:52:10 UTC (rev 97046)
@@ -5,7 +5,8 @@
 0.5.2dev (unreleased)
 ---------------------
 
-- ...
+- Cleanup dependencies. Change package's mailing list address to
+  zope-dev at zope.org instead of retired one.
 
 
 0.5.1 (2009-02-22)

Modified: z3c.searcher/trunk/setup.py
===================================================================
--- z3c.searcher/trunk/setup.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/setup.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -25,7 +25,7 @@
     name='z3c.searcher',
     version='0.5.2dev',
     author = "Roger Ineichen and the Zope Community",
-    author_email = "zope3-dev at zope.org",
+    author_email = "zope-dev at zope.org",
     description = "Persistent and session based search form for Zope3",
     long_description=(
         read('README.txt')
@@ -60,10 +60,11 @@
             'z3c.macro',
             'z3c.testing',
             'zope.app.authentication',
-            'zope.app.keyreference',
             'zope.app.pagetemplate',
             'zope.app.testing',
             'zope.contentprovider',
+            'zope.intid',
+            'zope.keyreference',
             'zope.publisher',
             'zope.session',
             'zope.testing',
@@ -73,12 +74,9 @@
         'setuptools',
         'z3c.form',
         'z3c.formui',
-        'z3c.i18n',
         'z3c.indexer',
         'z3c.template',
         'z3c.table',
-        'zc.catalog',
-        'zope.app.intid',
         'zope.container',
         'zope.component',
         'zope.event',

Modified: z3c.searcher/trunk/src/z3c/searcher/README.txt
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/README.txt	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/README.txt	2009-02-22 15:52:10 UTC (rev 97046)
@@ -41,8 +41,8 @@
 
 Setup a IIntIds utility:
 
-  >>> from zope.app.intid import IntIds
-  >>> from zope.app.intid.interfaces import IIntIds
+  >>> from zope.intid import IntIds
+  >>> from zope.intid.interfaces import IIntIds
   >>> intids = IntIds()
   >>> sm['default']['intids'] = intids
   >>> sm.registerUtility(intids, IIntIds)

Modified: z3c.searcher/trunk/src/z3c/searcher/criterium.py
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/criterium.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/criterium.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -21,9 +21,9 @@
 from zope.schema.fieldproperty import FieldProperty
 from zope.container import contained
 
-from z3c.i18n import MessageFactory as _
 from z3c.indexer import query
 from z3c.searcher import interfaces
+from z3c.searcher.interfaces import _
 
 
 class SearchCriterium(persistent.Persistent, contained.Contained):

Modified: z3c.searcher/trunk/src/z3c/searcher/form.py
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/form.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/form.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -27,7 +27,6 @@
 from z3c.template.template import getPageTemplate
 from z3c.template.template import getLayoutTemplate
 
-from z3c.i18n import MessageFactory as _
 from z3c.form.interfaces import IWidgets
 from z3c.form import button
 from z3c.form import field
@@ -35,6 +34,7 @@
 from z3c.formui import form as formui
 from z3c.form.browser.radio import RadioFieldWidget
 from z3c.searcher import interfaces
+from z3c.searcher.interfaces import _
 from z3c.searcher import criterium
 from z3c.searcher import filter
 

Modified: z3c.searcher/trunk/src/z3c/searcher/interfaces.py
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/interfaces.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/interfaces.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -16,19 +16,21 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.i18nmessageid
 import zope.interface
 import zope.schema
 from zope.schema import vocabulary
 from zope.session.interfaces import ISession
 from zope.location.interfaces import ILocation
 
-from z3c.i18n import MessageFactory as _
 from z3c.indexer import interfaces
 from z3c.indexer import query
 from z3c.form.interfaces import IForm
 from z3c.table.interfaces import ITable
 
+_ = zope.i18nmessageid.MessageFactory('z3c')
 
+
 SEARCH_SESSION = u'z3c.search.intefaces.ISearchSession'
 SEARCH_SESSION_FILTER_KEY = 'default'
 

Modified: z3c.searcher/trunk/src/z3c/searcher/table.py
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/table.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/table.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -21,9 +21,9 @@
 import z3c.table.table
 from z3c.form import button
 from z3c.template.template import getPageTemplate
-from z3c.i18n import MessageFactory as _
 
 from z3c.searcher import interfaces
+from z3c.searcher.interfaces import _
 from z3c.searcher import filter
 from z3c.searcher import form
 

Modified: z3c.searcher/trunk/src/z3c/searcher/testing.py
===================================================================
--- z3c.searcher/trunk/src/z3c/searcher/testing.py	2009-02-22 14:12:40 UTC (rev 97045)
+++ z3c.searcher/trunk/src/z3c/searcher/testing.py	2009-02-22 15:52:10 UTC (rev 97046)
@@ -16,6 +16,7 @@
 """
 
 import zope.component
+from zope.keyreference.testing import SimpleKeyReference
 from zope.publisher.interfaces import IRequest
 from zope.session import session
 from zope.session.http import CookieClientIdManager
@@ -24,7 +25,6 @@
 from zope.session.interfaces import ISession
 from zope.session.interfaces import ISessionDataContainer
 from zope.app.authentication.tests import TestClientId
-from zope.app.keyreference.testing import SimpleKeyReference
 from zope.app.testing import setup