[Checkins] SVN: zope.publisher/trunk/ Move some configuration from zope.app.i18n:

[Dan Korostelev]

Log message for revision 98204:
  Move some configuration from zope.app.i18n:
  
  Mark HTTPRequest as IAttributeAnnotatable if ``zope.annotation`` is available. 
  
  Register `IUserPreferredCharsets` adapter.
  

Changed:
  U   zope.publisher/trunk/CHANGES.txt
  U   zope.publisher/trunk/src/zope/publisher/configure.zcml

-=-
Modified: zope.publisher/trunk/CHANGES.txt
===================================================================
--- zope.publisher/trunk/CHANGES.txt	2009-03-17 17:01:12 UTC (rev 98203)
+++ zope.publisher/trunk/CHANGES.txt	2009-03-17 17:10:27 UTC (rev 98204)
@@ -4,8 +4,12 @@
 3.6.3 (unreleased)
 ------------------
 
-- ...
+- Mark HTTPRequest as IAttributeAnnotatable if ``zope.annotation`` is available,
+  this was previously done by ``zope.app.i18n``.
 
+- Register `IHTTPRequest` -> `IUserPreferredCharsets` adapter in ZCML
+  configuration. This was also previously done by ``zope.app.i18n``.
+
 3.6.2 (2009-03-14)
 ------------------
 

Modified: zope.publisher/trunk/src/zope/publisher/configure.zcml
===================================================================
--- zope.publisher/trunk/src/zope/publisher/configure.zcml	2009-03-17 17:01:12 UTC (rev 98203)
+++ zope.publisher/trunk/src/zope/publisher/configure.zcml	2009-03-17 17:10:27 UTC (rev 98204)
@@ -11,6 +11,15 @@
       interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
       type="zope.publisher.interfaces.browser.IBrowserSkinType"
       />
+
+  <class class="zope.publisher.http.HTTPRequest">
+    <implements
+        zcml:condition="installed zope.annotation"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
+        />
+  </class>
+
+  <adapter factory="zope.publisher.http.HTTPCharsets" />
   
   <class class="xmlrpclib.Binary">
     <allow attributes="data encode decode" />