From 65230a2de758fbde57b3893c402436ae0202ada3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Mon, 3 Jun 2002 15:58:32 +0000 Subject: Remove uses of the string and types modules: x in string.whitespace => x.isspace() type(x) in types.StringTypes => isinstance(x, basestring) isinstance(x, types.StringTypes) => isinstance(x, basestring) type(x) is types.StringType => isinstance(x, str) type(x) == types.StringType => isinstance(x, str) string.split(x, ...) => x.split(...) string.join(x, y) => y.join(x) string.zfill(x, ...) => x.zfill(...) string.count(x, ...) => x.count(...) hasattr(types, "UnicodeType") => try: unicode except NameError: type(x) != types.TupleTuple => not isinstance(x, tuple) isinstance(x, types.TupleType) => isinstance(x, tuple) type(x) is types.IntType => isinstance(x, int) Do not mention the string module in the rlcompleter docstring. This partially applies SF patch http://www.python.org/sf/562373 (with basestring instead of string). (It excludes the changes to unittest.py and does not change the os.stat stuff.) --- Lib/popen2.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Lib/popen2.py') diff --git a/Lib/popen2.py b/Lib/popen2.py index f00cb833fd..d6ff002a20 100644 --- a/Lib/popen2.py +++ b/Lib/popen2.py @@ -8,7 +8,6 @@ and popen3(cmd) which return two or three pipes to the spawned command. import os import sys -import types __all__ = ["popen2", "popen3", "popen4"] @@ -57,7 +56,7 @@ class Popen3: _active.append(self) def _run_child(self, cmd): - if isinstance(cmd, types.StringTypes): + if isinstance(cmd, basestring): cmd = ['/bin/sh', '-c', cmd] for i in range(3, MAXFD): try: -- cgit v1.2.1