[Zope3-checkins] CVS: Zope3/src/zope/i18n - globaltranslationservice.py:1.2.6.2 negotiator.py:1.3.4.2

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/i18n
In directory cvs.zope.org:/tmp/cvs-serv22756/src/zope/i18n

Modified Files:
      Tag: use-config-branch
	globaltranslationservice.py negotiator.py 
Log Message:
Get rid of IService.  Instead, add ILocalService, which only applies
(as the name implies) to local services.  Fewer files touched.

=== Zope3/src/zope/i18n/globaltranslationservice.py 1.2.6.1 => 1.2.6.2 ===
--- Zope3/src/zope/i18n/globaltranslationservice.py:1.2.6.1	Wed Feb 26 16:19:33 2003
+++ Zope3/src/zope/i18n/globaltranslationservice.py	Mon Mar  3 13:28:34 2003
@@ -18,7 +18,6 @@
 
 from zope.i18n.negotiator import negotiator
 from zope.i18n.simpletranslationservice import SimpleTranslationService
-from zope.component.interfaces import IService
 
 # The configure.zcml file should specify a list of fallback languages for the
 # site.  If a particular catalog for a negotiated language is not available,
@@ -33,7 +32,7 @@
 
 class GlobalTranslationService(SimpleTranslationService):
 
-    __implements__ =  SimpleTranslationService.__implements__, IService
+    __implements__ =  SimpleTranslationService.__implements__
 
     def __init__(self, default_domain='global', fallbacks=None):
         # XXX We haven't specified that ITranslationServices have a default


=== Zope3/src/zope/i18n/negotiator.py 1.3.4.1 => 1.3.4.2 ===
--- Zope3/src/zope/i18n/negotiator.py:1.3.4.1	Wed Feb 26 16:19:33 2003
+++ Zope3/src/zope/i18n/negotiator.py	Mon Mar  3 13:28:34 2003
@@ -20,11 +20,10 @@
 from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18n.interfaces import ILanguageAvailability
 from zope.component import getAdapter
-from zope.component.interfaces import IService
 
 class Negotiator:
 
-    __implements__ = INegotiator, IService
+    __implements__ = INegotiator
 
     def getLanguage(self, langs, env):
         envadaptor = getAdapter(env, IUserPreferredLanguages)