[Zope3-checkins] CVS: Zope3/src/zope/publisher - browser.py:1.14 http.py:1.19

[Marius Gedminas]

Update of /cvs-repository/Zope3/src/zope/publisher
In directory cvs.zope.org:/tmp/cvs-serv24834/src/zope/publisher

Modified Files:
	browser.py http.py 
Log Message:
Change 'adaptor' to 'adapter', clean up some whitespace in the vicinity.


=== Zope3/src/zope/publisher/browser.py 1.13 => 1.14 ===
--- Zope3/src/zope/publisher/browser.py:1.13	Fri Apr 11 06:08:09 2003
+++ Zope3/src/zope/publisher/browser.py	Fri Apr 11 08:47:43 2003
@@ -261,8 +261,8 @@
     def _decode(self, text):
         """Try to decode the text using one of the available charsets."""
         if self.charsets is None:
-            envadaptor = getAdapter(self, IUserPreferredCharsets)
-            self.charsets = envadaptor.getPreferredCharsets()
+            envadapter = getAdapter(self, IUserPreferredCharsets)
+            self.charsets = envadapter.getPreferredCharsets()
         for charset in self.charsets:
             try:
                 text = unicode(text, charset)


=== Zope3/src/zope/publisher/http.py 1.18 => 1.19 ===
--- Zope3/src/zope/publisher/http.py:1.18	Fri Apr 11 08:38:00 2003
+++ Zope3/src/zope/publisher/http.py	Fri Apr 11 08:47:43 2003
@@ -782,13 +782,13 @@
 
     def setCharsetUsingRequest(self, request):
         'See IHTTPResponse'
-        envadaptor = queryAdapter(request, IUserPreferredCharsets)
-        if envadaptor is None:
+        envadapter = queryAdapter(request, IUserPreferredCharsets)
+        if envadapter is None:
             return
 
         # XXX This try/except looks rather suspicious :(
         try:
-            charset = envadaptor.getPreferredCharsets()[0]
+            charset = envadapter.getPreferredCharsets()[0]
         except:
             charset = 'UTF-8'
         self.setCharset(charset)