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/hmac.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Lib/hmac.py') diff --git a/Lib/hmac.py b/Lib/hmac.py index ba0a63c780..db9b404c9a 100644 --- a/Lib/hmac.py +++ b/Lib/hmac.py @@ -3,8 +3,6 @@ Implements the HMAC algorithm as described by RFC 2104. """ -import string - def _strxor(s1, s2): """Utility method. XOR the two strings s1 and s2 (must have same length). """ @@ -82,7 +80,7 @@ class HMAC: def hexdigest(self): """Like digest(), but returns a string of hexadecimal digits instead. """ - return "".join([string.zfill(hex(ord(x))[2:], 2) + return "".join([hex(ord(x))[2:].zfill(2) for x in tuple(self.digest())]) def new(key, msg = None, digestmod = None): -- cgit v1.2.1