Eliminate some test annoyances.

lib/python/ZPublisher/BeforeTraverse.py

@@ -10,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__version__='$Revision: 1.11 $'[11:-2]
+__version__='$Revision: 1.12 $'[11:-2]
 
 """BeforeTraverse interface and helper classes"""
 
@@ -141,7 +141,7 @@ class NameCaller:
                        2)
 
         try:
-            apply(meth, (container, request, None)[:args])
+            meth(*(container, request, None)[:args])
         except (ArithmeticError, AttributeError, FloatingPointError,
                 IOError, ImportError, IndexError, KeyError,
                 OSError, OverflowError, TypeError, ValueError,

lib/python/Zope/Startup/tests/testStarter.py

@@ -87,13 +87,20 @@ class ZopeStarterTestCase(unittest.TestCase):
     def testSetupLocale(self):
         # XXX this almost certainly won't work on all systems
         import locale
+        try:
             try:
                 conf = self.load_config_text("locale en_GB")
+            except ZConfig.DataConversionError, e:
+                # Skip this test if we don't have support.
+                if e.message.startswith(
+                    'The specified locale "en_GB" is not supported'):
+                    return
+                raise
             starter = ZopeStarter(conf)
             starter.setupLocale()
             self.assertEqual(locale.getlocale(), ['en_GB', 'ISO8859-1'])
         finally:
-            # resest to system-defined locale
+            # reset to system-defined locale
             locale.setlocale(locale.LC_ALL, '')
 
     def testSetupStartupHandler(self):