merge from 2.3

lib/python/Products/PythonScripts/PythonScript.py

@@ -89,7 +89,7 @@ This product provides support for Script objects containing restricted
 Python code.
 """
 
-__version__='$Revision: 1.17 $'[11:-2]
+__version__='$Revision: 1.18 $'[11:-2]
 
 import sys, os, traceback, re
 from Globals import DTMLFile, MessageDialog
@@ -363,7 +363,7 @@ class PythonScript(Script, Historical, Cacheable):
         self._validateProxy()
         self.ZCacheable_invalidate()
         self._proxy_roles=tuple(roles)
-        if REQUEST: return Globals.MessageDialog(
+        if REQUEST: return MessageDialog(
                     title  ='Success!',
                     message='Your changes have been saved',
                     action ='manage_main')

lib/python/ZPublisher/HTTPRequest.py

@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 
-__version__='$Revision: 1.43 $'[11:-2]
+__version__='$Revision: 1.44 $'[11:-2]
 
 import regex, re, sys, os, string, urllib
 from string import lower, atoi, rfind, split, strip, join, upper, find
@@ -351,7 +351,7 @@ class HTTPRequest(BaseRequest):
         hasattr=hasattr,
         getattr=getattr,
         setattr=setattr,
-        search_type=regex.compile(':[a-zA-Z][a-zA-Z0-9_]+$').search,
+        search_type=regex.compile('\(:[a-zA-Z][a-zA-Z0-9_]+\|\.[xy]\)$').search,
         rfind=string.rfind,
         ):
         """Process request inputs
@@ -1071,12 +1071,14 @@ class record:
     def __str__(self):
         L1 = self.__dict__.items()
         L1.sort()
-        return join(map(lambda item: "%s: %s" %item, L1), ", ") 
+        return join(map(lambda item: "%s: %s" % item, L1), ", ") 
 
     def __repr__(self):
         L1 = self.__dict__.items()
         L1.sort()
-        return join(map(lambda item: "%s: %s" %item, repr(L1)), ", ") 
+        return join(
+            map(lambda item: "%s: %s" % (item[0], repr(item[1])), L1)
+            , ", ") 
 
 # Flags
 SEQUENCE=1