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/nntplib.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Lib/nntplib.py') diff --git a/Lib/nntplib.py b/Lib/nntplib.py index 21faab1aa3..f09c69a421 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -31,7 +31,6 @@ are strings, not numbers, since they are rarely used for calculations. # Imports import re import socket -import types __all__ = ["NNTP","NNTPReplyError","NNTPTemporaryError", "NNTPPermanentError","NNTPProtocolError","NNTPDataError", @@ -218,7 +217,7 @@ class NNTP: openedFile = None try: # If a string was passed then open a file with that name - if isinstance(file, types.StringType): + if isinstance(file, str): openedFile = file = open(file, "w") resp = self.getresp() -- cgit v1.2.1