[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - Negotiator.py:1.1.2.5

Guido van Rossum guido@python.org
Tue, 4 Jun 2002 14:59:58 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/I18n
In directory cvs.zope.org:/tmp/cvs-serv1575/lib/python/Zope/I18n

Modified Files:
      Tag: Zope-3x-branch
	Negotiator.py 
Log Message:
Whoever (not Jeremy :-) checks in files from Windows with the CRLF
markers still left in, please stop doing this.  It screws up the
checkouts for everyone else (including Windows users who use the
command line cvs tools).  Hint: some wincvs do this.



=== Zope3/lib/python/Zope/I18n/Negotiator.py 1.1.2.4 => 1.1.2.5 ===
 # 
 ##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.I18n.INegotiator import INegotiator
-from Zope.I18n.IUserPreferedLanguages import IUserPreferedLanguages
-from Zope.ComponentArchitecture import getAdapter
-
-class Negotiator:
-
-    __implements__ = INegotiator
-
-    def getLanguage(self, object_langs, env):
-
-        adapter  = getAdapter(env, IUserPreferedLanguages)
-        user_langs = adapter.getLanguages()
-
-        for lang in user_langs:
-            if lang in object_langs:
-                return lang
-
-        return None
-
-
-negotiator = Negotiator()
+"""
+
+$Id$
+"""
+
+from Zope.I18n.INegotiator import INegotiator
+from Zope.I18n.IUserPreferedLanguages import IUserPreferedLanguages
+from Zope.ComponentArchitecture import getAdapter
+
+class Negotiator:
+
+    __implements__ = INegotiator
+
+    def getLanguage(self, object_langs, env):
+
+        adapter  = getAdapter(env, IUserPreferedLanguages)
+        user_langs = adapter.getLanguages()
+
+        for lang in user_langs:
+            if lang in object_langs:
+                return lang
+
+        return None
+
+
+negotiator = Negotiator()