commit 7a70ea41358e6a033807774a096c4fc99b2a5876
author Raymond Hettinger <python@rcn.com> Wed Sep 17 05:50:59 2003 +0000
committer Raymond Hettinger <python@rcn.com> Wed Sep 17 05:50:59 2003 +0000
tree 138ca88bc9ec73de4c484ea856ca0835caa4a0b6
parent d21fd7bd863b0c3922c00dcf7c883bea2b1ab522

SF patch #806246:  use basestring where possible
(Contributed by George Yoshida.)

Lib/pkgutil.py

diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
index 4237371..fbd708a 100644
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -50,7 +50,7 @@
     path = path[:] # Start with a copy of the existing path
 
     for dir in sys.path:
-        if not isinstance(dir, (str, unicode)) or not os.path.isdir(dir):
+        if not isinstance(dir, basestring) or not os.path.isdir(dir):
             continue
         subdir = os.path.join(dir, pname)
         # XXX This may still add duplicate entries to path on