blob: 17fc320aa6c50d75179f01db1ae6280dba576918 [file] [log] [blame]
Greg Ward2689e3d1999-03-22 14:52:19 +00001"""distutils.util
2
Greg Wardaebf7062000-04-04 02:05:59 +00003Miscellaneous utility functions -- anything that doesn't fit into
Greg Ward47527692000-09-30 18:49:14 +00004one of the other *util.py modules.
5"""
Greg Ward2689e3d1999-03-22 14:52:19 +00006
Greg Ward3ce77fd2000-03-02 01:49:45 +00007__revision__ = "$Id$"
Greg Ward2689e3d1999-03-22 14:52:19 +00008
Greg Ward1297b5c2000-09-30 20:37:56 +00009import sys, os, string, re
10from distutils.errors import DistutilsPlatformError
11from distutils.dep_util import newer
Greg Ward7c1a6d42000-03-29 02:48:40 +000012from distutils.spawn import spawn
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +000013from distutils import log
Greg Wardaa458bc2000-04-22 15:14:58 +000014
Greg Ward585df892000-03-01 14:40:15 +000015def get_platform ():
Greg Ward59399bb2000-09-15 01:16:14 +000016 """Return a string that identifies the current platform. This is used
17 mainly to distinguish platform-specific build directories and
18 platform-specific built distributions. Typically includes the OS name
19 and version and the architecture (as supplied by 'os.uname()'),
20 although the exact information included depends on the OS; eg. for IRIX
21 the architecture isn't particularly important (IRIX only runs on SGI
22 hardware), but for Linux the kernel version isn't particularly
23 important.
24
25 Examples of returned values:
26 linux-i586
27 linux-alpha (?)
28 solaris-2.6-sun4u
29 irix-5.3
30 irix64-6.2
Fred Drakeb94b8492001-12-06 20:51:35 +000031
Greg Ward59399bb2000-09-15 01:16:14 +000032 For non-POSIX platforms, currently just returns 'sys.platform'.
Greg Wardb75c4852000-06-18 15:45:55 +000033 """
Greg Wardec84c212000-09-30 17:09:39 +000034 if os.name != "posix" or not hasattr(os, 'uname'):
Greg Ward59399bb2000-09-15 01:16:14 +000035 # XXX what about the architecture? NT is Intel or Alpha,
36 # Mac OS is M68k or PPC, etc.
37 return sys.platform
38
39 # Try to distinguish various flavours of Unix
40
41 (osname, host, release, version, machine) = os.uname()
Andrew M. Kuchling83c158f2001-02-27 19:25:42 +000042
43 # Convert the OS name to lowercase and remove '/' characters
44 # (to accommodate BSD/OS)
Fred Drakeb94b8492001-12-06 20:51:35 +000045 osname = string.lower(osname)
Andrew M. Kuchling83c158f2001-02-27 19:25:42 +000046 osname = string.replace(osname, '/', '')
Fred Drakeb94b8492001-12-06 20:51:35 +000047
Greg Ward59399bb2000-09-15 01:16:14 +000048 if osname[:5] == "linux":
49 # At least on Linux/Intel, 'machine' is the processor --
50 # i386, etc.
51 # XXX what about Alpha, SPARC, etc?
52 return "%s-%s" % (osname, machine)
53 elif osname[:5] == "sunos":
54 if release[0] >= "5": # SunOS 5 == Solaris 2
55 osname = "solaris"
56 release = "%d.%s" % (int(release[0]) - 3, release[2:])
57 # fall through to standard osname-release-machine representation
58 elif osname[:4] == "irix": # could be "irix64"!
59 return "%s-%s" % (osname, release)
Fred Drakeb94b8492001-12-06 20:51:35 +000060 elif osname[:3] == "aix":
Andrew M. Kuchling9767e762001-02-27 18:48:00 +000061 return "%s-%s.%s" % (osname, version, release)
Andrew M. Kuchling989835c2001-01-19 16:26:12 +000062 elif osname[:6] == "cygwin":
Andrew M. Kuchling5a3e4cb2001-07-20 19:29:04 +000063 osname = "cygwin"
Andrew M. Kuchling989835c2001-01-19 16:26:12 +000064 rel_re = re.compile (r'[\d.]+')
65 m = rel_re.match(release)
66 if m:
67 release = m.group()
Fred Drakeb94b8492001-12-06 20:51:35 +000068
Greg Ward59399bb2000-09-15 01:16:14 +000069 return "%s-%s-%s" % (osname, release, machine)
70
71# get_platform ()
Greg Ward50919292000-03-07 03:27:08 +000072
73
Greg Wardd8dfb4c2000-05-31 02:32:10 +000074def convert_path (pathname):
Greg Wardb8b263b2000-09-30 18:40:42 +000075 """Return 'pathname' as a name that will work on the native filesystem,
76 i.e. split it on '/' and put it back together again using the current
77 directory separator. Needed because filenames in the setup script are
78 always supplied in Unix style, and have to be converted to the local
79 convention before we can actually use them in the filesystem. Raises
Greg Ward47527692000-09-30 18:49:14 +000080 ValueError on non-Unix-ish systems if 'pathname' either starts or
81 ends with a slash.
Greg Wardb8b263b2000-09-30 18:40:42 +000082 """
Greg Ward7ec05352000-09-22 01:05:43 +000083 if os.sep == '/':
84 return pathname
Neal Norwitzb0df6a12002-08-13 17:42:57 +000085 if not pathname:
86 return pathname
87 if pathname[0] == '/':
Greg Ward02a1a2b2000-04-15 22:15:07 +000088 raise ValueError, "path '%s' cannot be absolute" % pathname
Neal Norwitzb0df6a12002-08-13 17:42:57 +000089 if pathname[-1] == '/':
Greg Ward02a1a2b2000-04-15 22:15:07 +000090 raise ValueError, "path '%s' cannot end with '/'" % pathname
Greg Ward7ec05352000-09-22 01:05:43 +000091
92 paths = string.split(pathname, '/')
Jack Jansenb4cd5c12001-01-28 12:23:32 +000093 while '.' in paths:
94 paths.remove('.')
95 if not paths:
96 return os.curdir
Greg Ward7ec05352000-09-22 01:05:43 +000097 return apply(os.path.join, paths)
Greg Ward50919292000-03-07 03:27:08 +000098
Greg Wardd8dfb4c2000-05-31 02:32:10 +000099# convert_path ()
Greg Ward1b4ede52000-03-22 00:22:44 +0000100
101
Greg Ward67f75d42000-04-27 01:53:46 +0000102def change_root (new_root, pathname):
Greg Ward67f75d42000-04-27 01:53:46 +0000103 """Return 'pathname' with 'new_root' prepended. If 'pathname' is
104 relative, this is equivalent to "os.path.join(new_root,pathname)".
105 Otherwise, it requires making 'pathname' relative and then joining the
Greg Ward4b46ef92000-05-31 02:14:32 +0000106 two, which is tricky on DOS/Windows and Mac OS.
107 """
108 if os.name == 'posix':
Greg Wardbe86bde2000-09-26 01:56:15 +0000109 if not os.path.isabs(pathname):
110 return os.path.join(new_root, pathname)
Greg Ward4b46ef92000-05-31 02:14:32 +0000111 else:
Greg Wardbe86bde2000-09-26 01:56:15 +0000112 return os.path.join(new_root, pathname[1:])
Greg Ward67f75d42000-04-27 01:53:46 +0000113
114 elif os.name == 'nt':
Greg Wardbe86bde2000-09-26 01:56:15 +0000115 (drive, path) = os.path.splitdrive(pathname)
Greg Ward4b46ef92000-05-31 02:14:32 +0000116 if path[0] == '\\':
117 path = path[1:]
Greg Wardbe86bde2000-09-26 01:56:15 +0000118 return os.path.join(new_root, path)
Greg Ward67f75d42000-04-27 01:53:46 +0000119
Marc-André Lemburg2544f512002-01-31 18:56:00 +0000120 elif os.name == 'os2':
121 (drive, path) = os.path.splitdrive(pathname)
122 if path[0] == os.sep:
123 path = path[1:]
124 return os.path.join(new_root, path)
125
Greg Ward67f75d42000-04-27 01:53:46 +0000126 elif os.name == 'mac':
Greg Wardf5855742000-09-21 01:23:35 +0000127 if not os.path.isabs(pathname):
128 return os.path.join(new_root, pathname)
129 else:
130 # Chop off volume name from start of path
131 elements = string.split(pathname, ":", 1)
132 pathname = ":" + elements[1]
133 return os.path.join(new_root, pathname)
Greg Ward67f75d42000-04-27 01:53:46 +0000134
135 else:
136 raise DistutilsPlatformError, \
137 "nothing known about platform '%s'" % os.name
138
139
Gregory P. Smithe7e35ac2000-05-12 00:40:00 +0000140_environ_checked = 0
141def check_environ ():
Greg Ward1b4ede52000-03-22 00:22:44 +0000142 """Ensure that 'os.environ' has all the environment variables we
Greg Wardb8b263b2000-09-30 18:40:42 +0000143 guarantee that users can use in config files, command-line options,
144 etc. Currently this includes:
145 HOME - user's home directory (Unix only)
146 PLAT - description of the current platform, including hardware
147 and OS (see 'get_platform()')
Greg Ward1b4ede52000-03-22 00:22:44 +0000148 """
Gregory P. Smithe7e35ac2000-05-12 00:40:00 +0000149 global _environ_checked
150 if _environ_checked:
151 return
152
Greg Ward1b4ede52000-03-22 00:22:44 +0000153 if os.name == 'posix' and not os.environ.has_key('HOME'):
154 import pwd
Greg Wardbe86bde2000-09-26 01:56:15 +0000155 os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
Greg Ward1b4ede52000-03-22 00:22:44 +0000156
157 if not os.environ.has_key('PLAT'):
Greg Wardbe86bde2000-09-26 01:56:15 +0000158 os.environ['PLAT'] = get_platform()
Greg Ward1b4ede52000-03-22 00:22:44 +0000159
Gregory P. Smithe7e35ac2000-05-12 00:40:00 +0000160 _environ_checked = 1
161
Greg Ward1b4ede52000-03-22 00:22:44 +0000162
Jeremy Hylton5e2d0762001-01-25 20:10:32 +0000163def subst_vars (s, local_vars):
Greg Wardb8b263b2000-09-30 18:40:42 +0000164 """Perform shell/Perl-style variable substitution on 'string'. Every
Greg Ward47527692000-09-30 18:49:14 +0000165 occurrence of '$' followed by a name is considered a variable, and
166 variable is substituted by the value found in the 'local_vars'
167 dictionary, or in 'os.environ' if it's not in 'local_vars'.
168 'os.environ' is first checked/augmented to guarantee that it contains
169 certain values: see 'check_environ()'. Raise ValueError for any
170 variables not found in either 'local_vars' or 'os.environ'.
Greg Wardb8b263b2000-09-30 18:40:42 +0000171 """
Greg Wardbe86bde2000-09-26 01:56:15 +0000172 check_environ()
Greg Ward1b4ede52000-03-22 00:22:44 +0000173 def _subst (match, local_vars=local_vars):
174 var_name = match.group(1)
Greg Wardbe86bde2000-09-26 01:56:15 +0000175 if local_vars.has_key(var_name):
176 return str(local_vars[var_name])
Greg Ward1b4ede52000-03-22 00:22:44 +0000177 else:
178 return os.environ[var_name]
179
Greg Ward47527692000-09-30 18:49:14 +0000180 try:
Jeremy Hylton5e2d0762001-01-25 20:10:32 +0000181 return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
Greg Ward47527692000-09-30 18:49:14 +0000182 except KeyError, var:
183 raise ValueError, "invalid variable '$%s'" % var
Greg Ward1b4ede52000-03-22 00:22:44 +0000184
185# subst_vars ()
Greg Ward7c1a6d42000-03-29 02:48:40 +0000186
187
Greg Warde9055132000-06-17 02:16:46 +0000188def grok_environment_error (exc, prefix="error: "):
189 """Generate a useful error message from an EnvironmentError (IOError or
190 OSError) exception object. Handles Python 1.5.1 and 1.5.2 styles, and
191 does what it can to deal with exception objects that don't have a
192 filename (which happens when the error is due to a two-file operation,
193 such as 'rename()' or 'link()'. Returns the error message as a string
194 prefixed with 'prefix'.
195 """
196 # check for Python 1.5.2-style {IO,OS}Error exception objects
Greg Wardbe86bde2000-09-26 01:56:15 +0000197 if hasattr(exc, 'filename') and hasattr(exc, 'strerror'):
Greg Warde9055132000-06-17 02:16:46 +0000198 if exc.filename:
199 error = prefix + "%s: %s" % (exc.filename, exc.strerror)
200 else:
201 # two-argument functions in posix module don't
202 # include the filename in the exception object!
203 error = prefix + "%s" % exc.strerror
204 else:
205 error = prefix + str(exc[-1])
206
207 return error
Greg Ward6a2a3db2000-06-24 20:40:02 +0000208
209
210# Needed by 'split_quoted()'
Greg Ward2b042de2000-08-08 14:38:13 +0000211_wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
Greg Ward6a2a3db2000-06-24 20:40:02 +0000212_squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
213_dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
214
215def split_quoted (s):
216 """Split a string up according to Unix shell-like rules for quotes and
217 backslashes. In short: words are delimited by spaces, as long as those
218 spaces are not escaped by a backslash, or inside a quoted string.
219 Single and double quotes are equivalent, and the quote characters can
220 be backslash-escaped. The backslash is stripped from any two-character
221 escape sequence, leaving only the escaped character. The quote
222 characters are stripped from any quoted string. Returns a list of
223 words.
224 """
225
226 # This is a nice algorithm for splitting up a single string, since it
227 # doesn't require character-by-character examination. It was a little
228 # bit of a brain-bender to get it working right, though...
229
230 s = string.strip(s)
231 words = []
232 pos = 0
233
234 while s:
235 m = _wordchars_re.match(s, pos)
236 end = m.end()
237 if end == len(s):
238 words.append(s[:end])
239 break
240
Greg Ward2b042de2000-08-08 14:38:13 +0000241 if s[end] in string.whitespace: # unescaped, unquoted whitespace: now
Greg Ward6a2a3db2000-06-24 20:40:02 +0000242 words.append(s[:end]) # we definitely have a word delimiter
243 s = string.lstrip(s[end:])
244 pos = 0
245
246 elif s[end] == '\\': # preserve whatever is being escaped;
247 # will become part of the current word
248 s = s[:end] + s[end+1:]
249 pos = end+1
250
251 else:
252 if s[end] == "'": # slurp singly-quoted string
253 m = _squote_re.match(s, end)
254 elif s[end] == '"': # slurp doubly-quoted string
255 m = _dquote_re.match(s, end)
256 else:
257 raise RuntimeError, \
258 "this can't happen (bad char '%c')" % s[end]
259
260 if m is None:
261 raise ValueError, \
262 "bad string (mismatched %s quotes?)" % s[end]
263
264 (beg, end) = m.span()
265 s = s[:beg] + s[beg+1:end-1] + s[end:]
266 pos = m.end() - 2
267
268 if pos >= len(s):
269 words.append(s)
270 break
271
272 return words
273
274# split_quoted ()
Greg Ward1c16ac32000-08-02 01:37:30 +0000275
276
277def execute (func, args, msg=None, verbose=0, dry_run=0):
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000278 """Perform some action that affects the outside world (eg. by
279 writing to the filesystem). Such actions are special because they
280 are disabled by the 'dry_run' flag. This method takes care of all
281 that bureaucracy for you; all you have to do is supply the
282 function to call and an argument tuple for it (to embody the
283 "external action" being performed), and an optional message to
284 print.
Greg Ward1c16ac32000-08-02 01:37:30 +0000285 """
Greg Ward1c16ac32000-08-02 01:37:30 +0000286 if msg is None:
287 msg = "%s%s" % (func.__name__, `args`)
Fred Drakeb94b8492001-12-06 20:51:35 +0000288 if msg[-2:] == ',)': # correct for singleton tuple
Greg Ward1c16ac32000-08-02 01:37:30 +0000289 msg = msg[0:-2] + ')'
290
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000291 log.info(msg)
Greg Ward1c16ac32000-08-02 01:37:30 +0000292 if not dry_run:
293 apply(func, args)
294
Greg Ward817dc092000-09-25 01:25:06 +0000295
296def strtobool (val):
297 """Convert a string representation of truth to true (1) or false (0).
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000298
Greg Ward817dc092000-09-25 01:25:06 +0000299 True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
300 are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if
301 'val' is anything else.
302 """
303 val = string.lower(val)
304 if val in ('y', 'yes', 't', 'true', 'on', '1'):
305 return 1
306 elif val in ('n', 'no', 'f', 'false', 'off', '0'):
307 return 0
308 else:
309 raise ValueError, "invalid truth value %s" % `val`
Greg Ward1297b5c2000-09-30 20:37:56 +0000310
311
312def byte_compile (py_files,
313 optimize=0, force=0,
314 prefix=None, base_dir=None,
315 verbose=1, dry_run=0,
316 direct=None):
Greg Wardf217e212000-10-01 23:49:30 +0000317 """Byte-compile a collection of Python source files to either .pyc
318 or .pyo files in the same directory. 'py_files' is a list of files
319 to compile; any files that don't end in ".py" are silently skipped.
320 'optimize' must be one of the following:
Greg Ward1297b5c2000-09-30 20:37:56 +0000321 0 - don't optimize (generate .pyc)
322 1 - normal optimization (like "python -O")
323 2 - extra optimization (like "python -OO")
324 If 'force' is true, all files are recompiled regardless of
325 timestamps.
326
327 The source filename encoded in each bytecode file defaults to the
328 filenames listed in 'py_files'; you can modify these with 'prefix' and
329 'basedir'. 'prefix' is a string that will be stripped off of each
330 source filename, and 'base_dir' is a directory name that will be
331 prepended (after 'prefix' is stripped). You can supply either or both
332 (or neither) of 'prefix' and 'base_dir', as you wish.
333
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000334 If 'dry_run' is true, doesn't actually do anything that would
335 affect the filesystem.
Greg Ward1297b5c2000-09-30 20:37:56 +0000336
337 Byte-compilation is either done directly in this interpreter process
338 with the standard py_compile module, or indirectly by writing a
339 temporary script and executing it. Normally, you should let
340 'byte_compile()' figure out to use direct compilation or not (see
341 the source for details). The 'direct' flag is used by the script
342 generated in indirect mode; unless you know what you're doing, leave
343 it set to None.
344 """
345
346 # First, if the caller didn't force us into direct or indirect mode,
347 # figure out which mode we should be in. We take a conservative
348 # approach: choose direct mode *only* if the current interpreter is
349 # in debug mode and optimize is 0. If we're not in debug mode (-O
350 # or -OO), we don't know which level of optimization this
351 # interpreter is running with, so we can't do direct
352 # byte-compilation and be certain that it's the right thing. Thus,
353 # always compile indirectly if the current interpreter is in either
354 # optimize mode, or if either optimization level was requested by
355 # the caller.
356 if direct is None:
357 direct = (__debug__ and optimize == 0)
358
359 # "Indirect" byte-compilation: write a temporary script and then
360 # run it with the appropriate flags.
361 if not direct:
Marc-André Lemburg03750792002-12-03 08:45:11 +0000362 try:
363 from tempfile import mkstemp
364 (script_fd, script_name) = mkstemp(".py")
365 except ImportError:
366 from tempfile import mktemp
367 (script_fd, script_name) = None, mktemp(".py")
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000368 log.info("writing byte-compilation script '%s'", script_name)
Greg Ward1297b5c2000-09-30 20:37:56 +0000369 if not dry_run:
Marc-André Lemburg03750792002-12-03 08:45:11 +0000370 if script_fd is not None:
371 script = os.fdopen(script_fd, "w")
372 else:
373 script = open(script_name, "w")
Greg Ward1297b5c2000-09-30 20:37:56 +0000374
375 script.write("""\
376from distutils.util import byte_compile
377files = [
378""")
Greg Ward9216cfe2000-10-03 03:31:05 +0000379
380 # XXX would be nice to write absolute filenames, just for
381 # safety's sake (script should be more robust in the face of
382 # chdir'ing before running it). But this requires abspath'ing
383 # 'prefix' as well, and that breaks the hack in build_lib's
384 # 'byte_compile()' method that carefully tacks on a trailing
385 # slash (os.sep really) to make sure the prefix here is "just
386 # right". This whole prefix business is rather delicate -- the
387 # problem is that it's really a directory, but I'm treating it
388 # as a dumb string, so trailing slashes and so forth matter.
389
390 #py_files = map(os.path.abspath, py_files)
391 #if prefix:
392 # prefix = os.path.abspath(prefix)
393
Greg Ward1297b5c2000-09-30 20:37:56 +0000394 script.write(string.join(map(repr, py_files), ",\n") + "]\n")
395 script.write("""
396byte_compile(files, optimize=%s, force=%s,
397 prefix=%s, base_dir=%s,
398 verbose=%s, dry_run=0,
399 direct=1)
400""" % (`optimize`, `force`, `prefix`, `base_dir`, `verbose`))
401
402 script.close()
403
404 cmd = [sys.executable, script_name]
405 if optimize == 1:
406 cmd.insert(1, "-O")
407 elif optimize == 2:
408 cmd.insert(1, "-OO")
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000409 spawn(cmd, dry_run=dry_run)
Greg Ward9216cfe2000-10-03 03:31:05 +0000410 execute(os.remove, (script_name,), "removing %s" % script_name,
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000411 dry_run=dry_run)
Fred Drakeb94b8492001-12-06 20:51:35 +0000412
Greg Ward1297b5c2000-09-30 20:37:56 +0000413 # "Direct" byte-compilation: use the py_compile module to compile
414 # right here, right now. Note that the script generated in indirect
415 # mode simply calls 'byte_compile()' in direct mode, a weird sort of
416 # cross-process recursion. Hey, it works!
417 else:
418 from py_compile import compile
419
420 for file in py_files:
421 if file[-3:] != ".py":
Greg Wardf217e212000-10-01 23:49:30 +0000422 # This lets us be lazy and not filter filenames in
423 # the "install_lib" command.
424 continue
Greg Ward1297b5c2000-09-30 20:37:56 +0000425
426 # Terminology from the py_compile module:
427 # cfile - byte-compiled file
428 # dfile - purported source filename (same as 'file' by default)
429 cfile = file + (__debug__ and "c" or "o")
430 dfile = file
431 if prefix:
432 if file[:len(prefix)] != prefix:
433 raise ValueError, \
434 ("invalid prefix: filename %s doesn't start with %s"
435 % (`file`, `prefix`))
436 dfile = dfile[len(prefix):]
437 if base_dir:
438 dfile = os.path.join(base_dir, dfile)
439
440 cfile_base = os.path.basename(cfile)
441 if direct:
442 if force or newer(file, cfile):
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000443 log.info("byte-compiling %s to %s", file, cfile_base)
Greg Ward1297b5c2000-09-30 20:37:56 +0000444 if not dry_run:
445 compile(file, cfile, dfile)
446 else:
Jeremy Hyltoncd8a1142002-06-04 20:14:43 +0000447 log.debug("skipping byte-compilation of %s to %s",
448 file, cfile_base)
Greg Ward1297b5c2000-09-30 20:37:56 +0000449
450# byte_compile ()
Andrew M. Kuchlingdf66df02001-03-22 03:03:41 +0000451
452def rfc822_escape (header):
453 """Return a version of the string escaped for inclusion in an
Andrew M. Kuchling88b08842001-03-23 17:30:26 +0000454 RFC-822 header, by ensuring there are 8 spaces space after each newline.
Andrew M. Kuchlingdf66df02001-03-22 03:03:41 +0000455 """
Andrew M. Kuchling88b08842001-03-23 17:30:26 +0000456 lines = string.split(header, '\n')
457 lines = map(string.strip, lines)
458 header = string.join(lines, '\n' + 8*' ')
Andrew M. Kuchlingdf66df02001-03-22 03:03:41 +0000459 return header