Merged revisions 55795-55816 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
  r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines

  Get rid of some remnants of classic classes.  types.ClassType == type.
  Also get rid of almost all uses of the types module and use the builtin name.
........
  r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line

  Remove a use of types, verify commit hook works
........
  r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines

  Fix syntax error introduced by Neal in last checkin.
........

1 files changed, 2 insertions, 10 deletions

diff --git a/Lib/xml/sax/saxutils.py b/Lib/xml/sax/saxutils.py
index ff9f596..a4bcb08 100644
--- a/Lib/xml/sax/saxutils.py
+++ b/Lib/xml/sax/saxutils.py
@@ -3,18 +3,10 @@ A library of useful helper classes to the SAX classes, for the
 convenience of application and driver writers.
 """
 
-import os, urlparse, urllib, types
+import os, urlparse, urllib
 from . import handler
 from . import xmlreader
 
-try:
-    _StringTypes = [types.StringType, types.UnicodeType]
-except AttributeError:
-    try:
-        _StringTypes = [types.StringType]
-    except AttributeError:
-        _StringTypes = [str]
-
 # See whether the xmlcharrefreplace error handler is
 # supported
 try:
@@ -280,7 +272,7 @@ def prepare_input_source(source, base = ""):
     """This function takes an InputSource and an optional base URL and
     returns a fully resolved InputSource object ready for reading."""
 
-    if type(source) in _StringTypes:
+    if isinstance(source, basestring):
         source = xmlreader.InputSource(source)
     elif hasattr(source, "read"):
         f = source