cpython-lru_cache-weakref: Lib/cgi.py annotate

annotate Lib/cgi.py @ 48178:cf331fef3293 legacy-trunk

Silence warnings under -3 triggered by wsgiref.

author	Brett Cannon <bcannon@gmail.com>
date	Mon, 04 Aug 2008 21:30:53 +0000
parents	5e8a7f9d9523
children	ca4c51358629

rev	line source
14989 2b4236580e0c Undo Ping's change. Guido van Rossum <guido@python.org> parents: 14988 diff changeset	1 #! /usr/local/bin/python
3106 c41a8e501973 handle missing QUERY_STRING Guido van Rossum <guido@python.org> parents: 2918 diff changeset	2
16583 817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	3 # NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	4 # intentionally NOT "/usr/bin/env python". On many systems
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	5 # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	6 # scripts, and /usr/local/bin is the default directory where Python is
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	7 # installed, so /usr/bin/env would be unable to find python. Granted,
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	8 # binary installations by Linux vendors often install Python in
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	9 # /usr/bin. So let those vendors patch cgi.py to match their choice
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	10 # of installation.
817df9efacba Added a comment explaining why this file must really have #! Guido van Rossum <guido@python.org> parents: 16503 diff changeset	11
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	12 """Support module for CGI (Common Gateway Interface) scripts.
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	13
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	14 This module defines a number of utilities for use by CGI scripts
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	15 written in Python.
11870 d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	16 """
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	17
13840 465144abf02a Remove very long doc string (it's all in the docs) Jeremy Hylton <jeremy@alum.mit.edu> parents: 13620 diff changeset	18 # XXX Perhaps there should be a slimmed version that doesn't contain
465144abf02a Remove very long doc string (it's all in the docs) Jeremy Hylton <jeremy@alum.mit.edu> parents: 13620 diff changeset	19 # all those backwards compatible and debugging classes and functions?
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	20
11870 d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	21 # History
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	22 # -------
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	23 #
11870 d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	24 # Michael McLay started this module. Steve Majewski changed the
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	25 # interface to SvFormContentDict and FormContentDict. The multipart
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	26 # parsing was inspired by code submitted by Andreas Paepcke. Guido van
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	27 # Rossum rewrote, reformatted and documented the module and is currently
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11849 diff changeset	28 # responsible for its maintenance.
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	29 #
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	30
18337 c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	31 __version__ = "2.6"
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	32
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	33
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	34 # Imports
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	35 # =======
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	36
34294 3e9a4d531e56 Remove some lambdas. Raymond Hettinger <python@rcn.com> parents: 34293 diff changeset	37 from operator import attrgetter
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	38 import sys
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	39 import os
5988 5993a099d9b0 Changes suggested by Jim fulton: Guido van Rossum <guido@python.org> parents: 5870 diff changeset	40 import urllib
35598 40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	41 import mimetools
40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	42 import rfc822
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	43 import UserDict
34293 cd517701fd93 Use cStringIO where available. Raymond Hettinger <python@rcn.com> parents: 33131 diff changeset	44 try:
cd517701fd93 Use cStringIO where available. Raymond Hettinger <python@rcn.com> parents: 33131 diff changeset	45 from cStringIO import StringIO
cd517701fd93 Use cStringIO where available. Raymond Hettinger <python@rcn.com> parents: 33131 diff changeset	46 except ImportError:
cd517701fd93 Use cStringIO where available. Raymond Hettinger <python@rcn.com> parents: 33131 diff changeset	47 from StringIO import StringIO
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	48
17074 8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	49 __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict",
8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	50 "SvFormContentDict", "InterpFormContentDict", "FormContent",
8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	51 "parse", "parse_qs", "parse_qsl", "parse_multipart",
8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	52 "parse_header", "print_exception", "print_environ",
8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	53 "print_form", "print_directory", "print_arguments",
8323b098c6ce Add a whole lot of stuff to __all__. Guido van Rossum <guido@python.org> parents: 16821 diff changeset	54 "print_environ_usage", "escape"]
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	55
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	56 # Logging support
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	57 # ===============
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	58
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	59 logfile = "" # Filename to log to, if not empty
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	60 logfp = None # File object to log to, if not None
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	61
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	62 def initlog(*allargs):
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	63 """Write a log message, if there is a log file.
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	64
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	65 Even though this function is called initlog(), you should always
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	66 use log(); log is a variable that is set either to initlog
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	67 (initially), to dolog (once the log file has been opened), or to
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	68 nolog (when logging is disabled).
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	69
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	70 The first argument is a format string; the remaining arguments (if
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	71 any) are arguments to the % operator, so e.g.
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	72 log("%s: %s", "a", "b")
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	73 will write "a: b" to the log file, followed by a newline.
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	74
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	75 If the global logfp is not None, it should be a file object to
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	76 which log data is written.
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	77
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	78 If the global logfp is None, the global logfile may be a string
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	79 giving a filename to open, in append mode. This file should be
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	80 world writable!!! If the file can't be opened, logging is
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	81 silently disabled (since there is no safe place where we could
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	82 send an error message).
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	83
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	84 """
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	85 global logfp, log
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	86 if logfile and not logfp:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	87 try:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	88 logfp = open(logfile, "a")
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	89 except IOError:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	90 pass
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	91 if not logfp:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	92 log = nolog
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	93 else:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	94 log = dolog
28089 14f65d661084 Get rid of many apply() calls. Guido van Rossum <guido@python.org> parents: 25214 diff changeset	95 log(*allargs)
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	96
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	97 def dolog(fmt, *args):
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	98 """Write a log message to the log file. See initlog() for docs."""
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	99 logfp.write(fmt%args + "\n")
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	100
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	101 def nolog(*allargs):
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	102 """Dummy function, assigned to log when logging is disabled."""
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	103 pass
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	104
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	105 log = initlog # The current logging function
4214 688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	106
688d566cb15b Added logging support. Guido van Rossum <guido@python.org> parents: 4213 diff changeset	107
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	108 # Parsing functions
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	109 # =================
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	110
5499 b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	111 # Maximum input we will accept when REQUEST_METHOD is POST
b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	112 # 0 ==> unlimited input
b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	113 maxlen = 0
b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	114
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	115 def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	116 """Parse a query in the environment or from a file (default stdin)
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	117
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	118 Arguments, all optional:
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	119
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	120 fp : file pointer; default: sys.stdin
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	121
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	122 environ : environment dictionary; default: os.environ
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	123
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	124 keep_blank_values: flag indicating whether blank values in
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	125 URL encoded forms should be treated as blank strings.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	126 A true value indicates that blanks should be retained as
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	127 blank strings. The default false value indicates that
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	128 blank values are to be ignored and treated as if they were
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	129 not included.
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	130
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	131 strict_parsing: flag indicating what to do with parsing errors.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	132 If false (the default), errors are silently ignored.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	133 If true, errors raise a ValueError exception.
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	134 """
23609 456d58451fee Use is None rather than general boolean Raymond Hettinger <python@rcn.com> parents: 22830 diff changeset	135 if fp is None:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	136 fp = sys.stdin
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	137 if not 'REQUEST_METHOD' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	138 environ['REQUEST_METHOD'] = 'GET' # For testing stand-alone
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	139 if environ['REQUEST_METHOD'] == 'POST':
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	140 ctype, pdict = parse_header(environ['CONTENT_TYPE'])
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	141 if ctype == 'multipart/form-data':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	142 return parse_multipart(fp, pdict)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	143 elif ctype == 'application/x-www-form-urlencoded':
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	144 clength = int(environ['CONTENT_LENGTH'])
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	145 if maxlen and clength > maxlen:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	146 raise ValueError, 'Maximum content length exceeded'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	147 qs = fp.read(clength)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	148 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	149 qs = '' # Unknown content-type
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	150 if 'QUERY_STRING' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	151 if qs: qs = qs + '&'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	152 qs = qs + environ['QUERY_STRING']
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	153 elif sys.argv[1:]:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	154 if qs: qs = qs + '&'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	155 qs = qs + sys.argv[1]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	156 environ['QUERY_STRING'] = qs # XXX Shouldn't, really
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	157 elif 'QUERY_STRING' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	158 qs = environ['QUERY_STRING']
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	159 else:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	160 if sys.argv[1:]:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	161 qs = sys.argv[1]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	162 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	163 qs = ""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	164 environ['QUERY_STRING'] = qs # XXX Shouldn't, really
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	165 return parse_qs(qs, keep_blank_values, strict_parsing)
2918 cfa9b3a84872 added parse_qs(query_string) Guido van Rossum <guido@python.org> parents: 2538 diff changeset	166
cfa9b3a84872 added parse_qs(query_string) Guido van Rossum <guido@python.org> parents: 2538 diff changeset	167
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	168 def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	169 """Parse a query given as a string argument.
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	170
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	171 Arguments:
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	172
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	173 qs: URL-encoded query string to be parsed
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	174
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	175 keep_blank_values: flag indicating whether blank values in
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	176 URL encoded queries should be treated as blank strings.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	177 A true value indicates that blanks should be retained as
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	178 blank strings. The default false value indicates that
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	179 blank values are to be ignored and treated as if they were
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	180 not included.
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	181
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	182 strict_parsing: flag indicating what to do with parsing errors.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	183 If false (the default), errors are silently ignored.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	184 If true, errors raise a ValueError exception.
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	185 """
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	186 dict = {}
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	187 for name, value in parse_qsl(qs, keep_blank_values, strict_parsing):
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	188 if name in dict:
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	189 dict[name].append(value)
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	190 else:
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	191 dict[name] = [value]
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	192 return dict
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	193
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	194 def parse_qsl(qs, keep_blank_values=0, strict_parsing=0):
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	195 """Parse a query given as a string argument.
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	196
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	197 Arguments:
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	198
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	199 qs: URL-encoded query string to be parsed
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	200
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	201 keep_blank_values: flag indicating whether blank values in
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	202 URL encoded queries should be treated as blank strings. A
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	203 true value indicates that blanks should be retained as blank
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	204 strings. The default false value indicates that blank values
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	205 are to be ignored and treated as if they were not included.
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	206
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	207 strict_parsing: flag indicating what to do with parsing errors. If
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	208 false (the default), errors are silently ignored. If true,
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	209 errors raise a ValueError exception.
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	210
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	211 Returns a list, as G-d intended.
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	212 """
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	213 pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	214 r = []
f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	215 for name_value in pairs:
32758 859ea8612eb0 Don't return spurious empty fields if 'keep_empty_values' is True. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 31758 diff changeset	216 if not name_value and not strict_parsing:
859ea8612eb0 Don't return spurious empty fields if 'keep_empty_values' is True. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 31758 diff changeset	217 continue
14606 f2fc66a6153b fix bug #110661 (PR#356) -- accept either & or ; as separator for CGI Jeremy Hylton <jeremy@alum.mit.edu> parents: 14196 diff changeset	218 nv = name_value.split('=', 1)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	219 if len(nv) != 2:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	220 if strict_parsing:
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	221 raise ValueError, "bad query field: %r" % (name_value,)
31758 3e49eb32470b Change parse_qsl() to accept control-name's with no equal sign (e.g., "name") Brett Cannon <bcannon@gmail.com> parents: 31515 diff changeset	222 # Handle case of a control-name with no equal sign
3e49eb32470b Change parse_qsl() to accept control-name's with no equal sign (e.g., "name") Brett Cannon <bcannon@gmail.com> parents: 31515 diff changeset	223 if keep_blank_values:
3e49eb32470b Change parse_qsl() to accept control-name's with no equal sign (e.g., "name") Brett Cannon <bcannon@gmail.com> parents: 31515 diff changeset	224 nv.append('')
3e49eb32470b Change parse_qsl() to accept control-name's with no equal sign (e.g., "name") Brett Cannon <bcannon@gmail.com> parents: 31515 diff changeset	225 else:
3e49eb32470b Change parse_qsl() to accept control-name's with no equal sign (e.g., "name") Brett Cannon <bcannon@gmail.com> parents: 31515 diff changeset	226 continue
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	227 if len(nv[1]) or keep_blank_values:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	228 name = urllib.unquote(nv[0].replace('+', ' '))
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	229 value = urllib.unquote(nv[1].replace('+', ' '))
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	230 r.append((name, value))
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	231
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	232 return r
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	233
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	234
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	235 def parse_multipart(fp, pdict):
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	236 """Parse multipart input.
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	237
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	238 Arguments:
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	239 fp : input file
34367 5cd4fffaf910 Patch #1079734: remove dependencies on (deprecated) rfc822 and mimetools Johannes Gijsbers <jlg@dds.nl> parents: 34294 diff changeset	240 pdict: dictionary containing other parameters of content-type header
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	241
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	242 Returns a dictionary just like parse_qs(): keys are the field names, each
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	243 value is a list of values for that field. This is easy to use but not
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	244 much good if you are expecting megabytes to be uploaded -- in that case,
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	245 use the FieldStorage class instead which is much more flexible. Note
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	246 that content-type is the raw, unparsed contents of the content-type
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	247 header.
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	248
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	249 XXX This does not parse nested multipart parts -- use FieldStorage for
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	250 that.
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	251
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	252 XXX This should really be subsumed by FieldStorage altogether -- no
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	253 point in having two implementations of the same parsing algorithm.
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	254 Also, FieldStorage protects itself better against certain DoS attacks
9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	255 by limiting the size of the data read in one chunk. The API here
9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	256 does not support that kind of protection. This also affects parse()
9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	257 since it can call parse_multipart().
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	258
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	259 """
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	260 boundary = ""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	261 if 'boundary' in pdict:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	262 boundary = pdict['boundary']
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	263 if not valid_boundary(boundary):
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	264 raise ValueError, ('Invalid boundary in multipart form: %r'
71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	265 % (boundary,))
19119 600a9a2b7a18 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 18833 diff changeset	266
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	267 nextpart = "--" + boundary
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	268 lastpart = "--" + boundary + "--"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	269 partdict = {}
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	270 terminator = ""
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	271
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	272 while terminator != lastpart:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	273 bytes = -1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	274 data = None
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	275 if terminator:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	276 # At start of next part. Read headers first.
35598 40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	277 headers = mimetools.Message(fp)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	278 clength = headers.getheader('content-length')
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	279 if clength:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	280 try:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	281 bytes = int(clength)
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	282 except ValueError:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	283 pass
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	284 if bytes > 0:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	285 if maxlen and bytes > maxlen:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	286 raise ValueError, 'Maximum content length exceeded'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	287 data = fp.read(bytes)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	288 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	289 data = ""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	290 # Read lines until end of part.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	291 lines = []
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	292 while 1:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	293 line = fp.readline()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	294 if not line:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	295 terminator = lastpart # End outer loop
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	296 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	297 if line[:2] == "--":
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	298 terminator = line.strip()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	299 if terminator in (nextpart, lastpart):
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	300 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	301 lines.append(line)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	302 # Done with part.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	303 if data is None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	304 continue
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	305 if bytes < 0:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	306 if lines:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	307 # Strip final line terminator
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	308 line = lines[-1]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	309 if line[-2:] == "\r\n":
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	310 line = line[:-2]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	311 elif line[-1:] == "\n":
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	312 line = line[:-1]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	313 lines[-1] = line
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	314 data = "".join(lines)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	315 line = headers['content-disposition']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	316 if not line:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	317 continue
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	318 key, params = parse_header(line)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	319 if key != 'form-data':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	320 continue
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	321 if 'name' in params:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	322 name = params['name']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	323 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	324 continue
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	325 if name in partdict:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	326 partdict[name].append(data)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	327 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	328 partdict[name] = [data]
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	329
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	330 return partdict
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	331
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	332
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	333 def parse_header(line):
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	334 """Parse a Content-type like header.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	335
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	336 Return the main content-type and a dictionary of options.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	337
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	338 """
34294 3e9a4d531e56 Remove some lambdas. Raymond Hettinger <python@rcn.com> parents: 34293 diff changeset	339 plist = [x.strip() for x in line.split(';')]
24058 37ffce2d9c3c Code modernization. Replace v=s[i]; del s[i] with single lookup v=s.pop(i) Raymond Hettinger <python@rcn.com> parents: 23620 diff changeset	340 key = plist.pop(0).lower()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	341 pdict = {}
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	342 for p in plist:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	343 i = p.find('=')
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	344 if i >= 0:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	345 name = p[:i].strip().lower()
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	346 value = p[i+1:].strip()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	347 if len(value) >= 2 and value[0] == value[-1] == '"':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	348 value = value[1:-1]
33131 846ba2972d7c Let cgi.parse_header() properly unquote headers (patch #1008597). Johannes Gijsbers <jlg@dds.nl> parents: 32758 diff changeset	349 value = value.replace('\\\\', '\\').replace('\\"', '"')
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	350 pdict[name] = value
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	351 return key, pdict
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	352
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	353
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	354 # Classes for field storage
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	355 # =========================
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	356
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	357 class MiniFieldStorage:
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	358
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	359 """Like FieldStorage, for use when no file uploads are possible."""
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	360
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	361 # Dummy attributes
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	362 filename = None
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	363 list = None
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	364 type = None
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	365 file = None
3447 db76fd390f74 Change to use real temporary files instead of StringIO. Correct and Guido van Rossum <guido@python.org> parents: 3446 diff changeset	366 type_options = {}
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	367 disposition = None
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	368 disposition_options = {}
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	369 headers = {}
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	370
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	371 def __init__(self, name, value):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	372 """Constructor from field name and value."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	373 self.name = name
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	374 self.value = value
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	375 # self.file = StringIO(value)
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	376
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	377 def __repr__(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	378 """Return printable representation."""
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	379 return "MiniFieldStorage(%r, %r)" % (self.name, self.value)
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	380
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	381
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	382 class FieldStorage:
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	383
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	384 """Store a sequence of fields, reading multipart/form-data.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	385
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	386 This class provides naming, typing, files stored on disk, and
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	387 more. At the top level, it is accessible like a dictionary, whose
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	388 keys are the field names. (Note: None can occur as a field name.)
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	389 The items are either a Python list (if there's multiple values) or
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	390 another FieldStorage or MiniFieldStorage object. If it's a single
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	391 object, it has the following attributes:
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	392
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	393 name: the field name, if specified; otherwise None
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	394
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	395 filename: the filename, if specified; otherwise None; this is the
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	396 client side filename, not the file name on which it is
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	397 stored (that's a temporary file you don't deal with)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	398
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	399 value: the value as a string; for file uploads, this
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	400 transparently reads the file every time you request the value
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	401
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	402 file: the file(-like) object from which you can read the data;
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	403 None if the data is stored a simple string
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	404
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	405 type: the content-type, or None if not specified
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	406
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	407 type_options: dictionary of options specified on the content-type
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	408 line
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	409
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	410 disposition: content-disposition, or None if not specified
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	411
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	412 disposition_options: dictionary of corresponding options
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	413
35598 40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	414 headers: a dictionary(-like) object (sometimes rfc822.Message or a
40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	415 subclass thereof) containing all headers
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	416
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	417 The class is subclassable, mostly for the purpose of overriding
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	418 the make_file() method, which is called internally to come up with
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	419 a file open for reading and writing. This makes it possible to
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	420 override the default choice of storing all files in a temporary
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	421 directory and unlinking them as soon as they have been opened.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	422
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	423 """
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	424
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	425 def __init__(self, fp=None, headers=None, outerboundary="",
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	426 environ=os.environ, keep_blank_values=0, strict_parsing=0):
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	427 """Constructor. Read multipart/* until last part.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	428
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	429 Arguments, all optional:
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	430
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	431 fp : file pointer; default: sys.stdin
8284 f834e197bd14 Make Tim O'Malley's requested change: in FieldStorage.__init__(), when Guido van Rossum <guido@python.org> parents: 7755 diff changeset	432 (not used when the request method is GET)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	433
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	434 headers : header dictionary-like object; default:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	435 taken from environ as per CGI spec
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	436
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	437 outerboundary : terminating multipart boundary
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	438 (for internal use only)
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	439
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	440 environ : environment dictionary; default: os.environ
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	441
d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	442 keep_blank_values: flag indicating whether blank values in
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	443 URL encoded forms should be treated as blank strings.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	444 A true value indicates that blanks should be retained as
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	445 blank strings. The default false value indicates that
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	446 blank values are to be ignored and treated as if they were
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	447 not included.
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	448
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	449 strict_parsing: flag indicating what to do with parsing errors.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	450 If false (the default), errors are silently ignored.
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	451 If true, errors raise a ValueError exception.
4534 d90d7b541ada Added 'strict_parsing' option to all parsing functions. This causes a Guido van Rossum <guido@python.org> parents: 4486 diff changeset	452
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	453 """
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	454 method = 'GET'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	455 self.keep_blank_values = keep_blank_values
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	456 self.strict_parsing = strict_parsing
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	457 if 'REQUEST_METHOD' in environ:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	458 method = environ['REQUEST_METHOD'].upper()
47798 5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	459 self.qs_on_post = None
8548 fac33716a218 Treat "HEAD" same as "GET", so that CGI scripts won't fail. Guido van Rossum <guido@python.org> parents: 8485 diff changeset	460 if method == 'GET' or method == 'HEAD':
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	461 if 'QUERY_STRING' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	462 qs = environ['QUERY_STRING']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	463 elif sys.argv[1:]:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	464 qs = sys.argv[1]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	465 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	466 qs = ""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	467 fp = StringIO(qs)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	468 if headers is None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	469 headers = {'content-type':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	470 "application/x-www-form-urlencoded"}
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	471 if headers is None:
8485 7f94b4958056 Be more careful than the previous patch. The default content-type Guido van Rossum <guido@python.org> parents: 8477 diff changeset	472 headers = {}
7f94b4958056 Be more careful than the previous patch. The default content-type Guido van Rossum <guido@python.org> parents: 8477 diff changeset	473 if method == 'POST':
7f94b4958056 Be more careful than the previous patch. The default content-type Guido van Rossum <guido@python.org> parents: 8477 diff changeset	474 # Set default content-type for POST to what's traditional
7f94b4958056 Be more careful than the previous patch. The default content-type Guido van Rossum <guido@python.org> parents: 8477 diff changeset	475 headers['content-type'] = "application/x-www-form-urlencoded"
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	476 if 'CONTENT_TYPE' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	477 headers['content-type'] = environ['CONTENT_TYPE']
47798 5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	478 if 'QUERY_STRING' in environ:
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	479 self.qs_on_post = environ['QUERY_STRING']
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	480 if 'CONTENT_LENGTH' in environ:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	481 headers['content-length'] = environ['CONTENT_LENGTH']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	482 self.fp = fp or sys.stdin
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	483 self.headers = headers
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	484 self.outerboundary = outerboundary
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	485
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	486 # Process content-disposition header
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	487 cdisp, pdict = "", {}
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	488 if 'content-disposition' in self.headers:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	489 cdisp, pdict = parse_header(self.headers['content-disposition'])
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	490 self.disposition = cdisp
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	491 self.disposition_options = pdict
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	492 self.name = None
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	493 if 'name' in pdict:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	494 self.name = pdict['name']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	495 self.filename = None
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	496 if 'filename' in pdict:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	497 self.filename = pdict['filename']
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	498
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	499 # Process content-type header
9821 28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	500 #
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	501 # Honor any existing content-type header. But if there is no
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	502 # content-type header, use some sensible defaults. Assume
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	503 # outerboundary is "" at the outer level, but something non-false
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	504 # inside a multi-part. The default for an inner part is text/plain,
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	505 # but for an outer part it should be urlencoded. This should catch
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	506 # bogus clients which erroneously forget to include a content-type
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	507 # header.
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	508 #
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	509 # See below for what we do if there does exist a content-type header,
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	510 # but it happens to be something we don't understand.
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	511 if 'content-type' in self.headers:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	512 ctype, pdict = parse_header(self.headers['content-type'])
10914 3fdf1c7d9f98 At Jim Fulton's request (actually, as a compromise :-), default the Guido van Rossum <guido@python.org> parents: 9821 diff changeset	513 elif self.outerboundary or method != 'POST':
9821 28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	514 ctype, pdict = "text/plain", {}
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	515 else:
28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	516 ctype, pdict = 'application/x-www-form-urlencoded', {}
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	517 self.type = ctype
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	518 self.type_options = pdict
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	519 self.innerboundary = ""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	520 if 'boundary' in pdict:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	521 self.innerboundary = pdict['boundary']
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	522 clen = -1
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	523 if 'content-length' in self.headers:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	524 try:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	525 clen = int(self.headers['content-length'])
22476 d77e748865ff tighten up except - only ValueError can be raised in this situation Skip Montanaro <skip@pobox.com> parents: 21917 diff changeset	526 except ValueError:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	527 pass
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	528 if maxlen and clen > maxlen:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	529 raise ValueError, 'Maximum content length exceeded'
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	530 self.length = clen
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	531
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	532 self.list = self.file = None
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	533 self.done = 0
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	534 if ctype == 'application/x-www-form-urlencoded':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	535 self.read_urlencoded()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	536 elif ctype[:10] == 'multipart/':
9410 620e02250c80 Patch by Jim Fulton, who writes: Guido van Rossum <guido@python.org> parents: 8548 diff changeset	537 self.read_multi(environ, keep_blank_values, strict_parsing)
10976 0f0a66c1deac After more discussion with Jim, change the behavior so that only a Guido van Rossum <guido@python.org> parents: 10920 diff changeset	538 else:
9821 28d3a9fcb577 FieldStorage.__init__(): if there is no content-type header, use Barry Warsaw <barry@python.org> parents: 9615 diff changeset	539 self.read_single()
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	540
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	541 def __repr__(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	542 """Return a printable representation."""
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	543 return "FieldStorage(%r, %r, %r)" % (
71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	544 self.name, self.filename, self.value)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	545
25214 5330c0620810 Patch suggested by Hamish Lawson: add an __iter__() that returns Guido van Rossum <guido@python.org> parents: 24058 diff changeset	546 def __iter__(self):
5330c0620810 Patch suggested by Hamish Lawson: add an __iter__() that returns Guido van Rossum <guido@python.org> parents: 24058 diff changeset	547 return iter(self.keys())
5330c0620810 Patch suggested by Hamish Lawson: add an __iter__() that returns Guido van Rossum <guido@python.org> parents: 24058 diff changeset	548
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	549 def __getattr__(self, name):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	550 if name != 'value':
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	551 raise AttributeError, name
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	552 if self.file:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	553 self.file.seek(0)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	554 value = self.file.read()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	555 self.file.seek(0)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	556 elif self.list is not None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	557 value = self.list
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	558 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	559 value = None
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	560 return value
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	561
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	562 def __getitem__(self, key):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	563 """Dictionary style indexing."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	564 if self.list is None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	565 raise TypeError, "not indexable"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	566 found = []
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	567 for item in self.list:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	568 if item.name == key: found.append(item)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	569 if not found:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	570 raise KeyError, key
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	571 if len(found) == 1:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	572 return found[0]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	573 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	574 return found
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	575
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	576 def getvalue(self, key, default=None):
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	577 """Dictionary style get() method, including 'value' lookup."""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	578 if key in self:
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	579 value = self[key]
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	580 if type(value) is type([]):
34294 3e9a4d531e56 Remove some lambdas. Raymond Hettinger <python@rcn.com> parents: 34293 diff changeset	581 return map(attrgetter('value'), value)
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	582 else:
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	583 return value.value
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	584 else:
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	585 return default
41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	586
19744 f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	587 def getfirst(self, key, default=None):
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	588 """ Return the first value received."""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	589 if key in self:
19744 f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	590 value = self[key]
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	591 if type(value) is type([]):
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	592 return value[0].value
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	593 else:
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	594 return value.value
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	595 else:
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	596 return default
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	597
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	598 def getlist(self, key):
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	599 """ Return list of received values."""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	600 if key in self:
19744 f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	601 value = self[key]
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	602 if type(value) is type([]):
34294 3e9a4d531e56 Remove some lambdas. Raymond Hettinger <python@rcn.com> parents: 34293 diff changeset	603 return map(attrgetter('value'), value)
19744 f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	604 else:
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	605 return [value.value]
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	606 else:
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	607 return []
f1430e3382bb Class FieldStorage: add two new methods, getfirst() and getlist(), Guido van Rossum <guido@python.org> parents: 19119 diff changeset	608
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	609 def keys(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	610 """Dictionary style keys() method."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	611 if self.list is None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	612 raise TypeError, "not indexable"
43414 7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	613 return list(set(item.name for item in self.list))
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	614
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	615 def has_key(self, key):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	616 """Dictionary style has_key() method."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	617 if self.list is None:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	618 raise TypeError, "not indexable"
43414 7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	619 return any(item.name == key for item in self.list)
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	620
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	621 def __contains__(self, key):
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	622 """Dictionary style __contains__ method."""
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	623 if self.list is None:
a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	624 raise TypeError, "not indexable"
43414 7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	625 return any(item.name == key for item in self.list)
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	626
4931 18023e7c3862 Add __len__ method Guido van Rossum <guido@python.org> parents: 4573 diff changeset	627 def __len__(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	628 """Dictionary style len(x) support."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	629 return len(self.keys())
4931 18023e7c3862 Add __len__ method Guido van Rossum <guido@python.org> parents: 4573 diff changeset	630
43414 7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	631 def __nonzero__(self):
7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	632 return bool(self.list)
7d14a3188850 Patch #1541463: optimize performance of cgi.FieldStorage operations. Georg Brandl <georg@python.org> parents: 39931 diff changeset	633
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	634 def read_urlencoded(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	635 """Internal: read data in query string format."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	636 qs = self.fp.read(self.length)
47798 5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	637 if self.qs_on_post:
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	638 qs += '&' + self.qs_on_post
10920 3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	639 self.list = list = []
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	640 for key, value in parse_qsl(qs, self.keep_blank_values,
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	641 self.strict_parsing):
3faa63430924 Patch by Jim Fulton: new function parse_qsl(), which is like Guido van Rossum <guido@python.org> parents: 10914 diff changeset	642 list.append(MiniFieldStorage(key, value))
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	643 self.skip_lines()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	644
9615 c03787ec9811 In read_multi, allow a subclass to override the class we instantiate Guido van Rossum <guido@python.org> parents: 9410 diff changeset	645 FieldStorageClass = None
c03787ec9811 In read_multi, allow a subclass to override the class we instantiate Guido van Rossum <guido@python.org> parents: 9410 diff changeset	646
9410 620e02250c80 Patch by Jim Fulton, who writes: Guido van Rossum <guido@python.org> parents: 8548 diff changeset	647 def read_multi(self, environ, keep_blank_values, strict_parsing):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	648 """Internal: read a part that is itself multipart."""
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	649 ib = self.innerboundary
3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	650 if not valid_boundary(ib):
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	651 raise ValueError, 'Invalid boundary in multipart form: %r' % (ib,)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	652 self.list = []
47798 5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	653 if self.qs_on_post:
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	654 for key, value in parse_qsl(self.qs_on_post, self.keep_blank_values,
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	655 self.strict_parsing):
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	656 self.list.append(MiniFieldStorage(key, value))
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	657 FieldStorageClass = None
5e8a7f9d9523 Now a from submitted via POST that also has a query string Facundo Batista <facundobatista@gmail.com> parents: 43414 diff changeset	658
9615 c03787ec9811 In read_multi, allow a subclass to override the class we instantiate Guido van Rossum <guido@python.org> parents: 9410 diff changeset	659 klass = self.FieldStorageClass or self.__class__
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	660 part = klass(self.fp, {}, ib,
9615 c03787ec9811 In read_multi, allow a subclass to override the class we instantiate Guido van Rossum <guido@python.org> parents: 9410 diff changeset	661 environ, keep_blank_values, strict_parsing)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	662 # Throw first part away
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	663 while not part.done:
35598 40ddf366f5a1 Reverted revision 1.83, which introduced a bug and subtle incompatibility Armin Rigo <arigo@tunes.org> parents: 35299 diff changeset	664 headers = rfc822.Message(self.fp)
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	665 part = klass(self.fp, headers, ib,
9615 c03787ec9811 In read_multi, allow a subclass to override the class we instantiate Guido van Rossum <guido@python.org> parents: 9410 diff changeset	666 environ, keep_blank_values, strict_parsing)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	667 self.list.append(part)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	668 self.skip_lines()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	669
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	670 def read_single(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	671 """Internal: read an atomic part."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	672 if self.length >= 0:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	673 self.read_binary()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	674 self.skip_lines()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	675 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	676 self.read_lines()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	677 self.file.seek(0)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	678
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	679 bufsize = 8*1024 # I/O buffering size for copy to file
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	680
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	681 def read_binary(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	682 """Internal: read binary data."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	683 self.file = self.make_file('b')
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	684 todo = self.length
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	685 if todo >= 0:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	686 while todo > 0:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	687 data = self.fp.read(min(todo, self.bufsize))
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	688 if not data:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	689 self.done = -1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	690 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	691 self.file.write(data)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	692 todo = todo - len(data)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	693
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	694 def read_lines(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	695 """Internal: read lines until EOF or outerboundary."""
18337 c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	696 self.file = self.__file = StringIO()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	697 if self.outerboundary:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	698 self.read_lines_to_outerboundary()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	699 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	700 self.read_lines_to_eof()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	701
18337 c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	702 def __write(self, line):
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	703 if self.__file is not None:
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	704 if self.__file.tell() + len(line) > 1000:
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	705 self.file = self.make_file('')
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	706 self.file.write(self.__file.getvalue())
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	707 self.__file = None
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	708 self.file.write(line)
c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	709
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	710 def read_lines_to_eof(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	711 """Internal: read lines until EOF."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	712 while 1:
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	713 line = self.fp.readline(1<<16)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	714 if not line:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	715 self.done = -1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	716 break
18337 c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	717 self.__write(line)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	718
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	719 def read_lines_to_outerboundary(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	720 """Internal: read lines until outerboundary."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	721 next = "--" + self.outerboundary
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	722 last = next + "--"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	723 delim = ""
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	724 last_line_lfend = True
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	725 while 1:
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	726 line = self.fp.readline(1<<16)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	727 if not line:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	728 self.done = -1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	729 break
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	730 if line[:2] == "--" and last_line_lfend:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	731 strippedline = line.strip()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	732 if strippedline == next:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	733 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	734 if strippedline == last:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	735 self.done = 1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	736 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	737 odelim = delim
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	738 if line[-2:] == "\r\n":
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	739 delim = "\r\n"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	740 line = line[:-2]
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	741 last_line_lfend = True
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	742 elif line[-1] == "\n":
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	743 delim = "\n"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	744 line = line[:-1]
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	745 last_line_lfend = True
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	746 else:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	747 delim = ""
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	748 last_line_lfend = False
18337 c2a60de91d2c Solve SF bug #231249: cgi.py opens too many (temporary) files. Guido van Rossum <guido@python.org> parents: 17074 diff changeset	749 self.__write(odelim + line)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	750
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	751 def skip_lines(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	752 """Internal: skip lines until outer boundary if defined."""
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	753 if not self.outerboundary or self.done:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	754 return
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	755 next = "--" + self.outerboundary
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	756 last = next + "--"
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	757 last_line_lfend = True
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	758 while 1:
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	759 line = self.fp.readline(1<<16)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	760 if not line:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	761 self.done = -1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	762 break
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	763 if line[:2] == "--" and last_line_lfend:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	764 strippedline = line.strip()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	765 if strippedline == next:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	766 break
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	767 if strippedline == last:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	768 self.done = 1
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	769 break
39427 9f08516a4d0c Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. Guido van Rossum <guido@python.org> parents: 35598 diff changeset	770 last_line_lfend = line.endswith('\n')
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	771
5988 5993a099d9b0 Changes suggested by Jim fulton: Guido van Rossum <guido@python.org> parents: 5870 diff changeset	772 def make_file(self, binary=None):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	773 """Overridable: return a readable & writable file.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	774
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	775 The file will be used as follows:
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	776 - data is written to it
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	777 - seek(0)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	778 - data is read from it
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	779
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	780 The 'binary' argument is unused -- the file is always opened
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	781 in binary mode.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	782
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	783 This version opens a temporary file for reading and writing,
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	784 and immediately deletes (unlinks) it. The trick (on Unix!) is
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	785 that the file can still be used, but it can't be opened by
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	786 another process, and it will automatically be deleted when it
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	787 is closed or when the current process terminates.
3447 db76fd390f74 Change to use real temporary files instead of StringIO. Correct and Guido van Rossum <guido@python.org> parents: 3446 diff changeset	788
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	789 If you want a more permanent file, you derive a class which
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	790 overrides this method. If you want a visible temporary file
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	791 that is nevertheless automatically deleted when the script
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	792 terminates, try defining a __del__ method in a derived class
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	793 which unlinks the temporary files you have created.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	794
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	795 """
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	796 import tempfile
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	797 return tempfile.TemporaryFile("w+b")
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	798
3437 d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	799
d70149202c93 Added FieldStorage class, which stores parts in files. Guido van Rossum <guido@python.org> parents: 3435 diff changeset	800
3447 db76fd390f74 Change to use real temporary files instead of StringIO. Correct and Guido van Rossum <guido@python.org> parents: 3446 diff changeset	801 # Backwards Compatibility Classes
db76fd390f74 Change to use real temporary files instead of StringIO. Correct and Guido van Rossum <guido@python.org> parents: 3446 diff changeset	802 # ===============================
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	803
14196 41234ae95d2a Closing patch #101120 -- After everyone agreed. Moshe Zadka <moshez@math.huji.ac.il> parents: 13840 diff changeset	804 class FormContentDict(UserDict.UserDict):
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	805 """Form content as dictionary with a list of values per field.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	806
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	807 form = FormContentDict()
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	808
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	809 form[key] -> [value, value, ...]
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	810 key in form -> Boolean
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	811 form.keys() -> [key, key, ...]
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	812 form.values() -> [[val, val, ...], [val, val, ...], ...]
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	813 form.items() -> [(key, [val, val, ...]), (key, [val, val, ...]), ...]
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	814 form.dict == {key: [val, val, ...], ...}
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	815
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	816 """
39931 ffb901374a38 Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes Georg Brandl <georg@python.org> parents: 39427 diff changeset	817 def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0):
ffb901374a38 Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes Georg Brandl <georg@python.org> parents: 39427 diff changeset	818 self.dict = self.data = parse(environ=environ,
ffb901374a38 Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes Georg Brandl <georg@python.org> parents: 39427 diff changeset	819 keep_blank_values=keep_blank_values,
ffb901374a38 Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes Georg Brandl <georg@python.org> parents: 39427 diff changeset	820 strict_parsing=strict_parsing)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	821 self.query_string = environ['QUERY_STRING']
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	822
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	823
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	824 class SvFormContentDict(FormContentDict):
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	825 """Form content as dictionary expecting a single value per field.
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	826
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	827 If you only expect a single value for each field, then form[key]
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	828 will return that single value. It will raise an IndexError if
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	829 that expectation is not true. If you expect a field to have
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	830 possible multiple values, than you can use form.getlist(key) to
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	831 get all of the values. values() and items() are a compromise:
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	832 they return single strings where there is a single value, and
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	833 lists of strings otherwise.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	834
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	835 """
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	836 def __getitem__(self, key):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	837 if len(self.dict[key]) > 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	838 raise IndexError, 'expecting a single value'
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	839 return self.dict[key][0]
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	840 def getlist(self, key):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	841 return self.dict[key]
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	842 def values(self):
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	843 result = []
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	844 for value in self.dict.values():
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	845 if len(value) == 1:
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	846 result.append(value[0])
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	847 else: result.append(value)
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	848 return result
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	849 def items(self):
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	850 result = []
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	851 for key, value in self.dict.items():
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	852 if len(value) == 1:
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	853 result.append((key, value[0]))
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	854 else: result.append((key, value))
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	855 return result
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	856
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	857
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	858 class InterpFormContentDict(SvFormContentDict):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	859 """This class is present for backwards compatibility only."""
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	860 def __getitem__(self, key):
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	861 v = SvFormContentDict.__getitem__(self, key)
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	862 if v[0] in '0123456789+-.':
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	863 try: return int(v)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	864 except ValueError:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	865 try: return float(v)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	866 except ValueError: pass
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	867 return v.strip()
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	868 def values(self):
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	869 result = []
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	870 for key in self.keys():
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	871 try:
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	872 result.append(self[key])
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	873 except IndexError:
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	874 result.append(self.dict[key])
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	875 return result
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	876 def items(self):
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	877 result = []
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	878 for key in self.keys():
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	879 try:
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	880 result.append((key, self[key]))
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	881 except IndexError:
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	882 result.append((key, self.dict[key]))
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	883 return result
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	884
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	885
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	886 class FormContent(FormContentDict):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	887 """This class is present for backwards compatibility only."""
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	888 def values(self, key):
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	889 if key in self.dict :return self.dict[key]
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	890 else: return None
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	891 def indexed_value(self, key, location):
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	892 if key in self.dict:
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	893 if len(self.dict[key]) > location:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	894 return self.dict[key][location]
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	895 else: return None
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	896 else: return None
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	897 def value(self, key):
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	898 if key in self.dict: return self.dict[key][0]
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	899 else: return None
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	900 def length(self, key):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	901 return len(self.dict[key])
3446 623ba9bdeb22 Considerable documentation changes and a few import rearrangements. Guido van Rossum <guido@python.org> parents: 3444 diff changeset	902 def stripped(self, key):
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23609 diff changeset	903 if key in self.dict: return self.dict[key][0].strip()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	904 else: return None
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	905 def pars(self):
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	906 return self.dict
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	907
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	908
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	909 # Test/debug code
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	910 # ===============
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	911
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	912 def test(environ=os.environ):
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	913 """Robust test CGI script, usable as main program.
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	914
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	915 Write minimal HTTP headers and dump all information provided to
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	916 the script in HTML form.
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	917
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	918 """
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	919 print "Content-type: text/html"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	920 print
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	921 sys.stderr = sys.stdout
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	922 try:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	923 form = FieldStorage() # Replace with other classes to test those
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	924 print_directory()
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	925 print_arguments()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	926 print_form(form)
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	927 print_environ(environ)
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	928 print_environ_usage()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	929 def f():
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	930 exec "testing print_exception() -- <I>italics?</I>"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	931 def g(f=f):
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	932 f()
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	933 print "<H3>What follows is a test, not an actual exception:</H3>"
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	934 g()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	935 except:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	936 print_exception()
4072 f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	937
14645 2d30c35feebe Improve the test output a bit. Guido van Rossum <guido@python.org> parents: 14606 diff changeset	938 print "<H1>Second try with a small maxlen...</H1>"
2d30c35feebe Improve the test output a bit. Guido van Rossum <guido@python.org> parents: 14606 diff changeset	939
5499 b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	940 global maxlen
b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	941 maxlen = 50
b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	942 try:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	943 form = FieldStorage() # Replace with other classes to test those
14677 a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	944 print_directory()
a7813ad73a4e Patch #101121, by Ka-Ping Yee: cosmetic cleanup of cgi.py, using my Guido van Rossum <guido@python.org> parents: 14645 diff changeset	945 print_arguments()
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	946 print_form(form)
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	947 print_environ(environ)
5499 b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	948 except:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	949 print_exception()
5499 b905372edd4f Untested changes by Skip Montanaro to have an optional limit on the Guido van Rossum <guido@python.org> parents: 5302 diff changeset	950
4072 f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	951 def print_exception(type=None, value=None, tb=None, limit=None):
f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	952 if type is None:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	953 type, value, tb = sys.exc_info()
4072 f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	954 import traceback
f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	955 print
15669 5c65e676f299 Make Traceback header conform to new traceback ("innermost last" -> Guido van Rossum <guido@python.org> parents: 15382 diff changeset	956 print "<H3>Traceback (most recent call last):</H3>"
4072 f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	957 list = traceback.format_tb(tb, limit) + \
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	958 traceback.format_exception_only(type, value)
4072 f66562536f11 Added print_exception() convenience function. Guido van Rossum <guido@python.org> parents: 3958 diff changeset	959 print "<PRE>%s<B>%s</B></PRE>" % (
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	960 escape("".join(list[:-1])),
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	961 escape(list[-1]),
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	962 )
6347 2656d1eea792 Use sys.exc_info() where needed. Guido van Rossum <guido@python.org> parents: 5988 diff changeset	963 del tb
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	964
3794 d1c47f4f1541 Changes by Jim Fulton: pass environ around as arg; Guido van Rossum <guido@python.org> parents: 3630 diff changeset	965 def print_environ(environ=os.environ):
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	966 """Dump the shell environment as HTML."""
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	967 keys = environ.keys()
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	968 keys.sort()
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	969 print
3629 e54d39107249 capitalize H3 headers; add 'cgi.' prefix to example code Guido van Rossum <guido@python.org> parents: 3451 diff changeset	970 print "<H3>Shell Environment:</H3>"
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	971 print "<DL>"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	972 for key in keys:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	973 print "<DT>", escape(key), "<DD>", escape(environ[key])
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	974 print "</DL>"
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	975 print
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	976
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	977 def print_form(form):
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	978 """Dump the contents of a form as HTML."""
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	979 keys = form.keys()
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	980 keys.sort()
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	981 print
3629 e54d39107249 capitalize H3 headers; add 'cgi.' prefix to example code Guido van Rossum <guido@python.org> parents: 3451 diff changeset	982 print "<H3>Form Contents:</H3>"
14645 2d30c35feebe Improve the test output a bit. Guido van Rossum <guido@python.org> parents: 14606 diff changeset	983 if not keys:
2d30c35feebe Improve the test output a bit. Guido van Rossum <guido@python.org> parents: 14606 diff changeset	984 print "<P>No form fields."
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	985 print "<DL>"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	986 for key in keys:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	987 print "<DT>" + escape(key) + ":",
fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	988 value = form[key]
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	989 print "<i>" + escape(repr(type(value))) + "</i>"
71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 28089 diff changeset	990 print "<DD>" + escape(repr(value))
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	991 print "</DL>"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	992 print
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	993
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	994 def print_directory():
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	995 """Dump the current directory as HTML."""
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	996 print
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	997 print "<H3>Current Working Directory:</H3>"
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	998 try:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	999 pwd = os.getcwd()
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1000 except os.error, msg:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	1001 print "os.error:", escape(str(msg))
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1002 else:
7755 fb4b4d069cc7 Mass check-in after untabifying all files that need it. Guido van Rossum <guido@python.org> parents: 6941 diff changeset	1003 print escape(pwd)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1004 print
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1005
3451 5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1006 def print_arguments():
5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1007 print
3629 e54d39107249 capitalize H3 headers; add 'cgi.' prefix to example code Guido van Rossum <guido@python.org> parents: 3451 diff changeset	1008 print "<H3>Command Line Arguments:</H3>"
3451 5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1009 print
5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1010 print sys.argv
5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1011 print
5abbc9b5fdf0 Added print_arguments() function. Guido van Rossum <guido@python.org> parents: 3447 diff changeset	1012
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1013 def print_environ_usage():
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1014 """Dump a list of environment variables used by CGI as HTML."""
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1015 print """
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1016 <H3>These environment variables could have been set:</H3>
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1017 <UL>
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1018 <LI>AUTH_TYPE
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1019 <LI>CONTENT_LENGTH
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1020 <LI>CONTENT_TYPE
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1021 <LI>DATE_GMT
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1022 <LI>DATE_LOCAL
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1023 <LI>DOCUMENT_NAME
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1024 <LI>DOCUMENT_ROOT
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1025 <LI>DOCUMENT_URI
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1026 <LI>GATEWAY_INTERFACE
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1027 <LI>LAST_MODIFIED
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1028 <LI>PATH
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1029 <LI>PATH_INFO
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1030 <LI>PATH_TRANSLATED
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1031 <LI>QUERY_STRING
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1032 <LI>REMOTE_ADDR
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1033 <LI>REMOTE_HOST
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1034 <LI>REMOTE_IDENT
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1035 <LI>REMOTE_USER
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1036 <LI>REQUEST_METHOD
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1037 <LI>SCRIPT_NAME
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1038 <LI>SERVER_NAME
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1039 <LI>SERVER_PORT
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1040 <LI>SERVER_PROTOCOL
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1041 <LI>SERVER_ROOT
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1042 <LI>SERVER_SOFTWARE
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1043 </UL>
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1044 In addition, HTTP headers sent by the server may be passed in the
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1045 environment as well. Here are some common variable names:
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1046 <UL>
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1047 <LI>HTTP_ACCEPT
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1048 <LI>HTTP_CONNECTION
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1049 <LI>HTTP_HOST
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1050 <LI>HTTP_PRAGMA
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1051 <LI>HTTP_REFERER
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1052 <LI>HTTP_USER_AGENT
e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1053 </UL>
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1054 """
4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1055
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1056
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1057 # Utilities
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1058 # =========
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1059
5870 fe4f1eb14d53 Add optional 'quote' flag argument to escape(); if true, translate '"' Guido van Rossum <guido@python.org> parents: 5654 diff changeset	1060 def escape(s, quote=None):
35299 5a9134fe5709 Bring cgi.escape docstring slightly more in line with the library ref Skip Montanaro <skip@pobox.com> parents: 34367 diff changeset	1061 '''Replace special characters "&", "<" and ">" to HTML-safe sequences.
5a9134fe5709 Bring cgi.escape docstring slightly more in line with the library ref Skip Montanaro <skip@pobox.com> parents: 34367 diff changeset	1062 If the optional flag quote is true, the quotation mark character (")
5a9134fe5709 Bring cgi.escape docstring slightly more in line with the library ref Skip Montanaro <skip@pobox.com> parents: 34367 diff changeset	1063 is also translated.'''
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	1064 s = s.replace("&", "&") # Must be done first!
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	1065 s = s.replace("<", "<")
8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	1066 s = s.replace(">", ">")
5870 fe4f1eb14d53 Add optional 'quote' flag argument to escape(); if true, translate '"' Guido van Rossum <guido@python.org> parents: 5654 diff changeset	1067 if quote:
16503 8d7655ac8bf8 String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16070 diff changeset	1068 s = s.replace('"', """)
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1069 return s
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1070
18833 3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	1071 def valid_boundary(s, _vb_pattern="^[ -~]{0,200}[!-~]$"):
3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	1072 import re
3cc66750687d Fix a denial-of-service attack, SF bug #443120. Guido van Rossum <guido@python.org> parents: 18337 diff changeset	1073 return re.match(_vb_pattern, s)
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1074
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1075 # Invoke mainline
6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1076 # ===============
2135 4f90b474beec new files Guido van Rossum <guido@python.org> parents: diff changeset	1077
3432 6abc75ec6d29 File upload and revamped documentation. Guido van Rossum <guido@python.org> parents: 3106 diff changeset	1078 # Call test() when this file is run as a script (not imported as a module)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15669 diff changeset	1079 if __name__ == '__main__':
3444 e76ca34d48f3 Reformatted with 4-space indentation. Added some quick docs to the Guido van Rossum <guido@python.org> parents: 3437 diff changeset	1080 test()

Mercurial > cpython-lru_cache-weakref

annotate Lib/cgi.py @ 48178:cf331fef3293 legacy-trunk