Merged in changes from trunk. These are necessary, since they remove all

services other than the utility, adapter and service service, which will 
be removed by the work of this branch.

tests/placelesssetup.py

@@ -0,0 +1,30 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Unit test logic for setting up and tearing down basic infrastructure
+
+$Id$
+"""
+from zope.app.testing import ztapi
+from zope.i18n.interfaces import IUserPreferredCharsets
+from zope.i18n.interfaces import IUserPreferredLanguages
+from zope.publisher.browser import BrowserLanguages
+from zope.publisher.http import HTTPCharsets, IHTTPRequest
+
+class PlacelessSetup(object):
+
+    def setUp(self):
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredLanguages,
+                             BrowserLanguages)