Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv32472 Modified Files: doctest.py pkgutil.py Log Message: SF patch #806246: use basestring where possible (Contributed by George Yoshida.) Index: doctest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** doctest.py 2 Sep 2003 02:09:05 -0000 1.31 --- doctest.py 17 Sep 2003 05:50:59 -0000 1.32 *************** *** 1188,1192 **** module = sys.modules[module] ! elif isinstance(module, (str, unicode)): # The ["*"] at the end is a mostly meaningless incantation with # a crucial property: if, e.g., module is 'a.b.c', it convinces --- 1188,1192 ---- module = sys.modules[module] ! elif isinstance(module, basestring): # The ["*"] at the end is a mostly meaningless incantation with # a crucial property: if, e.g., module is 'a.b.c', it convinces Index: pkgutil.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pkgutil.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pkgutil.py 23 Dec 2002 16:30:00 -0000 1.1 --- pkgutil.py 17 Sep 2003 05:50:59 -0000 1.2 *************** *** 51,55 **** for dir in sys.path: ! if not isinstance(dir, (str, unicode)) or not os.path.isdir(dir): continue subdir = os.path.join(dir, pname) --- 51,55 ---- for dir in sys.path: ! if not isinstance(dir, basestring) or not os.path.isdir(dir): continue subdir = os.path.join(dir, pname)