From dbecd93b7203cd187c1978de1207c29d3a9a686c Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Sun, 6 Feb 2005 06:57:08 +0000 Subject: Replace list of constants with tuples of constants. --- Lib/cgitb.py | 2 +- Lib/cookielib.py | 10 +++++----- Lib/decimal.py | 2 +- Lib/inspect.py | 10 +++++----- Lib/mhlib.py | 4 ++-- Lib/posixfile.py | 4 ++-- Lib/pydoc.py | 18 +++++++++--------- Lib/smtplib.py | 2 +- Lib/urllib2.py | 2 +- Lib/warnings.py | 2 +- Lib/whichdb.py | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py index db46b25..735683e 100644 --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -146,7 +146,7 @@ function calls leading up to the error, in the order they occurred.

''' if name in done: continue done[name] = 1 if value is not __UNDEF__: - if where in ['global', 'builtin']: + if where in ('global', 'builtin'): name = ('%s ' % where) + strong(name) elif where == 'local': name = strong(name) diff --git a/Lib/cookielib.py b/Lib/cookielib.py index 86479f8..268cc20 100644 --- a/Lib/cookielib.py +++ b/Lib/cookielib.py @@ -783,12 +783,12 @@ class Cookie: def __repr__(self): args = [] - for name in ["version", "name", "value", + for name in ("version", "name", "value", "port", "port_specified", "domain", "domain_specified", "domain_initial_dot", "path", "path_specified", "secure", "expires", "discard", "comment", "comment_url", - ]: + ): attr = getattr(self, name) args.append("%s=%s" % (name, repr(attr))) args.append("rest=%s" % repr(self._rest)) @@ -981,9 +981,9 @@ class DefaultCookiePolicy(CookiePolicy): if j == 0: # domain like .foo.bar tld = domain[i+1:] sld = domain[j+1:i] - if (sld.lower() in [ + if (sld.lower() in ( "co", "ac", - "com", "edu", "org", "net", "gov", "mil", "int"] and + "com", "edu", "org", "net", "gov", "mil", "int") and len(tld) == 2): # domain like .co.uk debug(" country-code second level domain %s", domain) @@ -1415,7 +1415,7 @@ class CookieJar: v = self._now + v if (k in value_attrs) or (k in boolean_attrs): if (v is None and - k not in ["port", "comment", "commenturl"]): + k not in ("port", "comment", "commenturl")): debug(" missing value for %s attribute" % k) bad_cookie = True break diff --git a/Lib/decimal.py b/Lib/decimal.py index 05bdc99..90e2dcc 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -515,7 +515,7 @@ class Decimal(object): if isinstance(value, (list,tuple)): if len(value) != 3: raise ValueError, 'Invalid arguments' - if value[0] not in [0,1]: + if value[0] not in (0,1): raise ValueError, 'Invalid sign' for digit in value[1]: if not isinstance(digit, (int,long)) or digit < 0: diff --git a/Lib/inspect.py b/Lib/inspect.py index 05bb71b..03347b9 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -346,7 +346,7 @@ def getmodulename(path): def getsourcefile(object): """Return the Python source file an object was defined in, if it exists.""" filename = getfile(object) - if string.lower(filename[-4:]) in ['.pyc', '.pyo']: + if string.lower(filename[-4:]) in ('.pyc', '.pyo'): filename = filename[:-4] + '.py' for suffix, mode, kind in imp.get_suffixes(): if 'b' in mode and string.lower(filename[-len(suffix):]) == suffix: @@ -453,7 +453,7 @@ def getcomments(object): # Look for a comment block at the top of the file. start = 0 if lines and lines[0][:2] == '#!': start = 1 - while start < len(lines) and string.strip(lines[start]) in ['', '#']: + while start < len(lines) and string.strip(lines[start]) in ('', '#'): start = start + 1 if start < len(lines) and lines[start][:1] == '#': comments = [] @@ -621,7 +621,7 @@ def getargs(co): # The following acrobatics are for anonymous (tuple) arguments. for i in range(nargs): - if args[i][:1] in ['', '.']: + if args[i][:1] in ('', '.'): stack, remain, count = [], [], [] while step < len(code): op = ord(code[step]) @@ -630,7 +630,7 @@ def getargs(co): opname = dis.opname[op] value = ord(code[step]) + ord(code[step+1])*256 step = step + 2 - if opname in ['UNPACK_TUPLE', 'UNPACK_SEQUENCE']: + if opname in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'): remain.append(value) count.append(value) elif opname == 'STORE_FAST': @@ -696,7 +696,7 @@ def joinseq(seq): def strseq(object, convert, join=joinseq): """Recursively walk a sequence, stringifying each element.""" - if type(object) in [types.ListType, types.TupleType]: + if type(object) in (list, tuple): return join(map(lambda o, c=convert, j=join: strseq(o, c, j), object)) else: return convert(object) diff --git a/Lib/mhlib.py b/Lib/mhlib.py index 1086121..1a90375 100644 --- a/Lib/mhlib.py +++ b/Lib/mhlib.py @@ -982,11 +982,11 @@ def test(): context = mh.getcontext() f = mh.openfolder(context) do('f.getcurrent()') - for seq in ['first', 'last', 'cur', '.', 'prev', 'next', + for seq in ('first', 'last', 'cur', '.', 'prev', 'next', 'first:3', 'last:3', 'cur:3', 'cur:-3', 'prev:3', 'next:3', '1:3', '1:-3', '100:3', '100:-3', '10000:3', '10000:-3', - 'all']: + 'all'): try: do('f.parsesequence(%r)' % (seq,)) except Error, msg: diff --git a/Lib/posixfile.py b/Lib/posixfile.py index ddfdb78..afffb66 100644 --- a/Lib/posixfile.py +++ b/Lib/posixfile.py @@ -182,7 +182,7 @@ class _posixfile_: 'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'): flock = struct.pack('lxxxxlxxxxlhh', \ l_start, l_len, os.getpid(), l_type, l_whence) - elif sys.platform in ['aix3', 'aix4']: + elif sys.platform in ('aix3', 'aix4'): flock = struct.pack('hhlllii', \ l_type, l_whence, l_start, l_len, 0, 0, 0) else: @@ -198,7 +198,7 @@ class _posixfile_: 'bsdos2', 'bsdos3', 'bsdos4'): l_start, l_len, l_pid, l_type, l_whence = \ struct.unpack('lxxxxlxxxxlhh', flock) - elif sys.platform in ['aix3', 'aix4']: + elif sys.platform in ('aix3', 'aix4'): l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \ struct.unpack('hhlllii', flock) elif sys.platform == "linux2": diff --git a/Lib/pydoc.py b/Lib/pydoc.py index d3b7362..94548e2 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -153,8 +153,8 @@ def _split_list(s, predicate): def visiblename(name, all=None): """Decide whether to show documentation on a variable.""" # Certain special names are redundant. - if name in ['__builtins__', '__doc__', '__file__', '__path__', - '__module__', '__name__', '__slots__']: return 0 + if name in ('__builtins__', '__doc__', '__file__', '__path__', + '__module__', '__name__', '__slots__'): return 0 # Private names are hidden, but special names are displayed. if name.startswith('__') and name.endswith('__'): return 1 if all is not None: @@ -176,7 +176,7 @@ def classify_class_attrs(object): def ispackage(path): """Guess whether a path refers to a package directory.""" if os.path.isdir(path): - for ext in ['.py', '.pyc', '.pyo']: + for ext in ('.py', '.pyc', '.pyo'): if os.path.isfile(os.path.join(path, '__init__' + ext)): return True return False @@ -1298,12 +1298,12 @@ def getpager(): return plainpager if not sys.stdin.isatty() or not sys.stdout.isatty(): return plainpager - if os.environ.get('TERM') in ['dumb', 'emacs']: + if os.environ.get('TERM') in ('dumb', 'emacs'): return plainpager if 'PAGER' in os.environ: if sys.platform == 'win32': # pipes completely broken in Windows return lambda text: tempfilepager(plain(text), os.environ['PAGER']) - elif os.environ.get('TERM') in ['dumb', 'emacs']: + elif os.environ.get('TERM') in ('dumb', 'emacs'): return lambda text: pipepager(plain(text), os.environ['PAGER']) else: return lambda text: pipepager(text, os.environ['PAGER']) @@ -1369,14 +1369,14 @@ def ttypager(text): sys.stdout.flush() c = getchar() - if c in ['q', 'Q']: + if c in ('q', 'Q'): sys.stdout.write('\r \r') break - elif c in ['\r', '\n']: + elif c in ('\r', '\n'): sys.stdout.write('\r \r' + lines[r] + '\n') r = r + 1 continue - if c in ['b', 'B', '\x1b']: + if c in ('b', 'B', '\x1b'): r = r - inc - inc if r < 0: r = 0 sys.stdout.write('\n' + join(lines[r:r+inc], '\n') + '\n') @@ -1646,7 +1646,7 @@ has the same effect as typing a particular string at the help> prompt. except (KeyboardInterrupt, EOFError): break request = strip(replace(request, '"', '', "'", '')) - if lower(request) in ['q', 'quit']: break + if lower(request) in ('q', 'quit'): break self.help(request) def getline(self, prompt): diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 52a2e1f..5b406af 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -578,7 +578,7 @@ class SMTP: (code, resp) = self.docmd(encode_base64(password, eol="")) elif authmethod is None: raise SMTPException("No suitable authentication method found.") - if code not in [235, 503]: + if code not in (235, 503): # 235 == 'Authentication successful' # 503 == 'Error: already authenticated' raise SMTPAuthenticationError(code, resp) diff --git a/Lib/urllib2.py b/Lib/urllib2.py index ae2ab17..3d8d593 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -384,7 +384,7 @@ class OpenerDirector: 'unknown_open', req) def error(self, proto, *args): - if proto in ['http', 'https']: + if proto in ('http', 'https'): # XXX http[s] protocols are special-cased dict = self.handle_error['http'] # https is not different than http proto = args[2] # YUCK! diff --git a/Lib/warnings.py b/Lib/warnings.py index 06d7685..87d3e29 100644 --- a/Lib/warnings.py +++ b/Lib/warnings.py @@ -216,7 +216,7 @@ def _getaction(action): if not action: return "default" if action == "all": return "always" # Alias - for a in ['default', 'always', 'ignore', 'module', 'once', 'error']: + for a in ('default', 'always', 'ignore', 'module', 'once', 'error'): if a.startswith(action): return a raise _OptionError("invalid action: %r" % (action,)) diff --git a/Lib/whichdb.py b/Lib/whichdb.py index cc5ced3..f077f87 100644 --- a/Lib/whichdb.py +++ b/Lib/whichdb.py @@ -62,7 +62,7 @@ def whichdb(filename): return "dumbdbm" f = open(filename + os.extsep + "dir", "rb") try: - if f.read(1) in ["'", '"']: + if f.read(1) in ("'", '"'): return "dumbdbm" finally: f.close() -- cgit v0.12