blob: 17f9bddb956904555006fbab2a0c4afd18cf9390 [file] [log] [blame]
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001\documentclass{howto}
2\usepackage{distutils}
3% $Id$
4
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +00005% Don't write extensive text for new sections; I'll do that.
6% Feel free to add commented-out reminders of things that need
7% to be covered. --amk
8
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +00009% XXX pydoc can display links to module docs -- but when?
10%
11
Fred Drakeed0fa3d2003-07-30 19:14:09 +000012\title{What's New in Python 2.4}
Andrew M. Kuchlingba59be02004-08-06 18:55:48 +000013\release{0.3}
Fred Drakeed0fa3d2003-07-30 19:14:09 +000014\author{A.M.\ Kuchling}
Fred Drakeb914ef02004-01-02 06:57:50 +000015\authoraddress{
16 \strong{Python Software Foundation}\\
17 Email: \email{amk@amk.ca}
18}
Fred Drakeed0fa3d2003-07-30 19:14:09 +000019
20\begin{document}
21\maketitle
22\tableofcontents
23
Andrew M. Kuchling89ba1ff2004-07-14 21:56:19 +000024This article explains the new features in Python 2.4 alpha2, scheduled
25for release in late July 2004. The final version of Python 2.4 is
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000026expected to be released around September 2004.
Fred Drakeed0fa3d2003-07-30 19:14:09 +000027
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000028Python 2.4 is a medium-sized release. It doesn't introduce as many
Andrew M. Kuchling3b790912004-07-04 16:39:40 +000029changes as the radical Python 2.2, but introduces more features than
30the conservative 2.3 release did. The most significant new language
31feature (as of this writing) is the addition of generator expressions;
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000032most other changes are to the standard library.
Fred Drakeed0fa3d2003-07-30 19:14:09 +000033
34This article doesn't attempt to provide a complete specification of
Andrew M. Kuchling3b790912004-07-04 16:39:40 +000035every single new feature, but instead provides a convenient overview.
36For full details, you should refer to the documentation for Python
372.4, such as the \citetitle[../lib/lib.html]{Python Library Reference}
38and the \citetitle[../ref/ref.html]{Python Reference Manual}. If you
39want to understand the complete implementation and design rationale,
40refer to the PEP for a particular new feature or to the module
41documentation.
Fred Drakeed0fa3d2003-07-30 19:14:09 +000042
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +000043
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000044%======================================================================
45\section{PEP 218: Built-In Set Objects}
46
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000047Python 2.3 introduced the \module{sets} module. C implementations of
48set data types have now been added to the Python core as two new
49built-in types, \function{set(\var{iterable})} and
50\function{frozenset(\var{iterable})}. They provide high speed
51operations for membership testing, for eliminating duplicates from
52sequences, and for mathematical operations like unions, intersections,
53differences, and symmetric differences.
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000054
55\begin{verbatim}
56>>> a = set('abracadabra') # form a set from a string
57>>> 'z' in a # fast membership testing
58False
59>>> a # unique letters in a
60set(['a', 'r', 'b', 'c', 'd'])
61>>> ''.join(a) # convert back into a string
62'arbcd'
Raymond Hettingerd4462302003-11-26 17:52:45 +000063
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000064>>> b = set('alacazam') # form a second set
65>>> a - b # letters in a but not in b
66set(['r', 'd', 'b'])
67>>> a | b # letters in either a or b
68set(['a', 'c', 'r', 'd', 'b', 'm', 'z', 'l'])
69>>> a & b # letters in both a and b
70set(['a', 'c'])
71>>> a ^ b # letters in a or b but not both
72set(['r', 'd', 'b', 'm', 'z', 'l'])
Raymond Hettingerd4462302003-11-26 17:52:45 +000073
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000074>>> a.add('z') # add a new element
75>>> a.update('wxy') # add multiple new elements
76>>> a
77set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z'])
78>>> a.remove('x') # take one element out
79>>> a
80set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z'])
81\end{verbatim}
82
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000083The \function{frozenset} type is an immutable version of \function{set}.
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000084Since it is immutable and hashable, it may be used as a dictionary key or
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000085as a member of another set.
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000086
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000087The \module{sets} module remains in the standard library, and may be
88useful if you wish to subclass the \class{Set} or \class{ImmutableSet}
89classes. There are currently no plans to deprecate the module.
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +000090
Raymond Hettinger7e0282f2003-11-24 07:14:54 +000091\begin{seealso}
92\seepep{218}{Adding a Built-In Set Object Type}{Originally proposed by
93Greg Wilson and ultimately implemented by Raymond Hettinger.}
94\end{seealso}
Fred Drakeed0fa3d2003-07-30 19:14:09 +000095
96%======================================================================
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +000097\section{PEP 237: Unifying Long Integers and Integers}
98
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +000099The lengthy transition process for this PEP, begun in Python 2.2,
Andrew M. Kuchlingd4be86c2004-07-04 01:44:04 +0000100takes another step forward in Python 2.4. In 2.3, certain integer
101operations that would behave differently after int/long unification
102triggered \exception{FutureWarning} warnings and returned values
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000103limited to 32 or 64 bits (depending on your platform). In 2.4, these
104expressions no longer produce a warning and instead produce a
105different result that's usually a long integer.
Andrew M. Kuchlingd4be86c2004-07-04 01:44:04 +0000106
107The problematic expressions are primarily left shifts and lengthy
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000108hexadecimal and octal constants. For example,
109\code{2 \textless{}\textless{} 32} results
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000110in a warning in 2.3, evaluating to 0 on 32-bit platforms. In Python
1112.4, this expression now returns the correct answer, 8589934592.
Andrew M. Kuchlingd4be86c2004-07-04 01:44:04 +0000112
113\begin{seealso}
114\seepep{237}{Unifying Long Integers and Integers}{Original PEP
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000115written by Moshe Zadka and GvR. The changes for 2.4 were implemented by
Andrew M. Kuchlingd4be86c2004-07-04 01:44:04 +0000116Kalle Svensson.}
117\end{seealso}
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +0000118
119%======================================================================
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000120\section{PEP 289: Generator Expressions}
Raymond Hettinger354433a2004-05-19 08:20:33 +0000121
Andrew M. Kuchling38dc2a62004-08-07 13:24:12 +0000122The iterator feature introduced in Python 2.2 and the
123\module{itertools} module make it easier to write programs that loop
124through large data sets without having the entire data set in memory
125at one time. List comprehensions don't fit into this picture very
126well because they produce a Python list object containing all of the
127items, unavoidably pulling them all into memory. When trying to write
128a functionally-styled program, it would be natural to write something
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000129like:
Raymond Hettinger354433a2004-05-19 08:20:33 +0000130
131\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000132links = [link for link in get_all_links() if not link.followed]
133for link in links:
134 ...
Raymond Hettinger354433a2004-05-19 08:20:33 +0000135\end{verbatim}
136
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000137instead of
Raymond Hettinger354433a2004-05-19 08:20:33 +0000138
139\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000140for link in get_all_links():
141 if link.followed:
142 continue
143 ...
144\end{verbatim}
Raymond Hettinger354433a2004-05-19 08:20:33 +0000145
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000146The first form is more concise and perhaps more readable, but if
147you're dealing with a large number of link objects the second form
Andrew M. Kuchling38dc2a62004-08-07 13:24:12 +0000148would have to be used to avoid having all link objects in memory at
149the same time.
Raymond Hettinger354433a2004-05-19 08:20:33 +0000150
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000151Generator expressions work similarly to list comprehensions but don't
152materialize the entire list; instead they create a generator that will
153return elements one by one. The above example could be written as:
Raymond Hettinger354433a2004-05-19 08:20:33 +0000154
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000155\begin{verbatim}
156links = (link for link in get_all_links() if not link.followed)
157for link in links:
158 ...
159\end{verbatim}
Raymond Hettinger170a6222004-05-19 19:45:19 +0000160
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000161Generator expressions always have to be written inside parentheses, as
162in the above example. The parentheses signalling a function call also
163count, so if you want to create a iterator that will be immediately
164passed to a function you could write:
Raymond Hettinger170a6222004-05-19 19:45:19 +0000165
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000166\begin{verbatim}
167print sum(obj.count for obj in list_all_objects())
168\end{verbatim}
Raymond Hettinger170a6222004-05-19 19:45:19 +0000169
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000170Generator expressions differ from list comprehensions in various small
171ways. Most notably, the loop variable (\var{obj} in the above
172example) is not accessible outside of the generator expression. List
173comprehensions leave the variable assigned to its last value; future
174versions of Python will change this, making list comprehensions match
175generator expressions in this respect.
Raymond Hettinger354433a2004-05-19 08:20:33 +0000176
177\begin{seealso}
178\seepep{289}{Generator Expressions}{Proposed by Raymond Hettinger and
179implemented by Jiwon Seo with early efforts steered by Hye-Shik Chang.}
180\end{seealso}
181
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +0000182
183%======================================================================
184\section{PEP 292: Simpler String Substitutions}
185
186Some new classes in the standard library provide a
187alternative mechanism for substituting variables into strings that's
188better-suited for applications where untrained users need to edit templates.
189
190The usual way of substituting variables by name is the \code{\%}
191operator:
192
193\begin{verbatim}
194>>> '%(page)i: %(title)s' % {'page':2, 'title': 'The Best of Times'}
195'2: The Best of Times'
196\end{verbatim}
197
198When writing the template string, it can be easy to forget the
199\samp{i} or \samp{s} after the closing parenthesis. This isn't a big
200problem if the template is in a Python module, because you run the
201code, get an ``Unsupported format character'' \exception{ValueError},
202and fix the problem. However, consider an application such as Mailman
203where template strings or translations are being edited by users who
204aren't aware of the Python language; the syntax is complicated to
205explain to such users, and if they make a mistake, it's difficult to
206provide helpful feedback to them.
207
208PEP 292 adds a \class{Template} class to the \module{string} module
209that uses \samp{\$} to indicate a substitution. \class{Template} is a
210subclass of the built-in Unicode type, so the result is always a
211Unicode string:
212
213\begin{verbatim}
214>>> import string
215>>> t = string.Template('$page: $title')
216>>> t % {'page':2, 'title': 'The Best of Times'}
217u'2: The Best of Times'
218>>> t2 % {'cost':42.50, 'action':'polish'}
219u'$ 42.5: polishing'
220\end{verbatim}
221
222% $ Terminate $-mode for Emacs
223
224If a key is missing from the dictionary, the \class{Template} class
225will raise a \exception{KeyError}. There's also a \class{SafeTemplate}
226class that ignores missing keys:
227
228\begin{verbatim}
229>>> t = string.SafeTemplate('$page: $title')
230>>> t % {'page':3}
231u'3: $title'
232\end{verbatim}
233
234Because templates are Unicode strings, you can use a template with the
235\module{gettext} module to look up translated versions of a message.
236
237\begin{seealso}
238\seepep{292}{Simpler String Substitutions}{Written and implemented
239by Barry Warsaw.}
240\end{seealso}
241
242
Raymond Hettinger354433a2004-05-19 08:20:33 +0000243%======================================================================
Andrew M. Kuchlingd91fcbe2004-08-02 12:44:28 +0000244\section{PEP 318: Decorators for Functions, Methods and Classes}
245
Andrew M. Kuchling77a602f2004-08-02 13:48:18 +0000246Python 2.2 extended Python's object model by adding static methods and
247class methods, but it didn't extend Python's syntax to provide any new
248way of defining static or class methods. Instead, you had to write a
249\keyword{def} statement in the usual way, and pass the resulting
250method to a \function{staticmethod()} or \function{classmethod()}
251function that would wrap up the function as a method of the new type.
252Your code would look like this:
253
254\begin{verbatim}
255class C:
256 def meth (cls):
257 ...
258
259 meth = classmethod(meth) # Rebind name to wrapped-up class method
260\end{verbatim}
261
262If the method was very long, it would be easy to miss or forget the
263\function{classmethod()} invocation after the function body.
264
265The intention was always to add some syntax to make such definitions
266more readable, but at the time of 2.2's release a good syntax was not
267obvious. Years later, when Python 2.4 is coming out, a good syntax
268\emph{still} isn't obvious but users are asking for easier access to
269the feature, so a new syntactic feature has been added.
270
271The feature is called ``function decorators''. The name comes from
272the idea that \function{classmethod}, \function{staticmethod}, and
273friends are storing additional information on a function object; they're
274\emph{decorating} functions with more details.
275
Fred Drake3f5c6542004-08-06 03:34:20 +0000276The notation borrows from Java and uses the \character{@} character as an
Andrew M. Kuchling77a602f2004-08-02 13:48:18 +0000277indicator. Using the new syntax, the example above would be written:
278
279\begin{verbatim}
280class C:
281
282 @classmethod
283 def meth (cls):
284 ...
285
286\end{verbatim}
287
288The \code{@classmethod} is shorthand for the
Fred Drake3f5c6542004-08-06 03:34:20 +0000289\code{meth=classmethod(meth)} assignment. More generally, if you have
Andrew M. Kuchling77a602f2004-08-02 13:48:18 +0000290the following:
291
292\begin{verbatim}
293@A @B @C
294def f ():
295 ...
296\end{verbatim}
297
298It's equivalent to:
299
300\begin{verbatim}
301def f(): ...
302f = C(B(A(f)))
303\end{verbatim}
304
305Decorators must come on the line before a function definition, and
306can't be on the same line, meaning that \code{@A def f(): ...} is
307illegal. You can only decorate function definitions, either at the
308module-level or inside a class; you can't decorate class definitions.
309
310A decorator is just a function that takes the function to be decorated
311as an argument and returns either the same function or some new
312callable thing. It's easy to write your own decorators. The
313following simple example just sets an attribute on the function
314object:
315
316\begin{verbatim}
317>>> def deco(func):
318... func.attr = 'decorated'
319... return func
320...
321>>> @deco
322... def f(): pass
323...
324>>> f
325<function f at 0x402ef0d4>
326>>> f.attr
327'decorated'
328>>>
329\end{verbatim}
330
331As a slightly more realistic example, the following decorator checks
332that the supplied argument is an integer:
333
334\begin{verbatim}
335def require_int (func):
336 def wrapper (arg):
337 assert isinstance(arg, int)
338 return func(arg)
339
340 return wrapper
341
342@require_int
343def p1 (arg):
344 print arg
345
346@require_int
347def p2(arg):
348 print arg*2
349\end{verbatim}
350
351An example in \pep{318} contains a fancier version of this idea that
352lets you specify the required type and check the returned type as
353well.
354
355Decorator functions can take arguments. If arguments are supplied,
356the decorator function is called with only those arguments and must
357return a new decorator function; this new function must take a single
358function and return a function, as previously described. In other
359words, \code{@A @B @C(args)} becomes:
360
361\begin{verbatim}
362def f(): ...
363_deco = C(args)
364f = _deco(B(A(f)))
365\end{verbatim}
366
367Getting this right can be slightly brain-bending, but it's not too
368difficult.
369
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +0000370A small related change makes the \member{func_name} attribute of
371functions writable. This attribute is used to display function names
372in tracebacks, so decorators should change the name of any new
373function that's constructed and returned.
374
Andrew M. Kuchling77a602f2004-08-02 13:48:18 +0000375The new syntax was provisionally added in 2.4alpha2, and is subject to
376change during the 2.4alpha release cycle depending on the Python
377community's reaction. Post-2.4 versions of Python will preserve
378compatibility with whatever syntax is used in 2.4final.
Andrew M. Kuchlingd91fcbe2004-08-02 12:44:28 +0000379
380\begin{seealso}
381\seepep{318}{Decorators for Functions, Methods and Classes}{Written
Andrew M. Kuchling77a602f2004-08-02 13:48:18 +0000382by Kevin D. Smith, Jim Jewett, and Skip Montanaro. Several people
383wrote patches implementing function decorators, but the one that was
Fred Drakee72bd4d2004-08-02 21:50:26 +0000384actually checked in was patch \#979728, written by Mark Russell.}
Andrew M. Kuchlingd91fcbe2004-08-02 12:44:28 +0000385\end{seealso}
386
387%======================================================================
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000388\section{PEP 322: Reverse Iteration}
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000389
Fred Drake56fcc232004-05-06 02:55:35 +0000390A new built-in function, \function{reversed(\var{seq})}, takes a sequence
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000391and returns an iterator that loops over the elements of the sequence
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000392in reverse order.
393
394\begin{verbatim}
Raymond Hettingerbc3cba22003-11-12 16:39:30 +0000395>>> for i in reversed(xrange(1,4)):
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000396... print i
397...
3983
3992
4001
401\end{verbatim}
402
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000403Compared to extended slicing, such as \code{range(1,4)[::-1]},
404\function{reversed()} is easier to read, runs faster, and uses
405substantially less memory.
Raymond Hettingerbc3cba22003-11-12 16:39:30 +0000406
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000407Note that \function{reversed()} only accepts sequences, not arbitrary
Raymond Hettingerbc3cba22003-11-12 16:39:30 +0000408iterators. If you want to reverse an iterator, first convert it to
409a list with \function{list()}.
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000410
411\begin{verbatim}
Andrew M. Kuchling44a31e12004-01-01 18:33:34 +0000412>>> input= open('/etc/passwd', 'r')
413>>> for line in reversed(list(input)):
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000414... print line
415...
416root:*:0:0:System Administrator:/var/root:/bin/tcsh
417 ...
418\end{verbatim}
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000419
Andrew M. Kuchlingf7a6b672003-11-08 16:05:37 +0000420\begin{seealso}
421\seepep{322}{Reverse Iteration}{Written and implemented by Raymond Hettinger.}
422
423\end{seealso}
424
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000425
426%======================================================================
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000427\section{PEP 327: Decimal Data Type}
428
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000429Python has always supported floating-point (FP) numbers as a data
430type, based on the underlying C \ctype{double} type. However, while
431most programming languages provide a floating-point type, most people
432(even programmers) are unaware that computing with floating-point
433numbers entails certain unavoidable inaccuracies. The new decimal
434type provides a way to avoid these inaccuracies.
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000435
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000436\subsection{Why is Decimal needed?}
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000437
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000438The limitations arise from the representation used for floating-point numbers.
439FP numbers are made up of three components:
440
441\begin{itemize}
442\item The sign, which is -1 or +1.
443\item The mantissa, which is a single-digit binary number
444followed by a fractional part. For example, \code{1.01} in base-2 notation
445is \code{1 + 0/2 + 1/4}, or 1.25 in decimal notation.
446\item The exponent, which tells where the decimal point is located in the number represented.
447\end{itemize}
448
449For example, the number 1.25 has sign +1, mantissa 1.01 (in binary),
450and exponent of 0 (the decimal point doesn't need to be shifted). The
451number 5 has the same sign and mantissa, but the exponent is 2
452because the mantissa is multiplied by 4 (2 to the power of the exponent 2).
453
454Modern systems usually provide floating-point support that conforms to
455a relevant standard called IEEE 754. C's \ctype{double} type is
456usually implemented as a 64-bit IEEE 754 number, which uses 52 bits of
457space for the mantissa. This means that numbers can only be specified
458to 52 bits of precision. If you're trying to represent numbers whose
459expansion repeats endlessly, the expansion is cut off after 52 bits.
460Unfortunately, most software needs to produce output in base 10, and
461base 10 often gives rise to such repeating decimals. For example, 1.1
462decimal is binary \code{1.0001100110011 ...}; .1 = 1/16 + 1/32 + 1/256
463plus an infinite number of additional terms. IEEE 754 has to chop off
464that infinitely repeated decimal after 52 digits, so the
465representation is slightly inaccurate.
466
467Sometimes you can see this inaccuracy when the number is printed:
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000468\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000469>>> 1.1
4701.1000000000000001
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000471\end{verbatim}
472
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000473The inaccuracy isn't always visible when you print the number because
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000474the FP-to-decimal-string conversion is provided by the C library and
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000475most C libraries try to produce sensible output, but the inaccuracy is
476still there and subsequent operations can magnify the error.
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000477
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000478For many applications this doesn't matter. If I'm plotting points and
479displaying them on my monitor, the difference between 1.1 and
4801.1000000000000001 is too small to be visible. Reports often limit
481output to a certain number of decimal places, and if you round the
482number to two or three or even eight decimal places, the error is
483never apparent. However, for applications where it does matter,
484it's a lot of work to implement your own custom arithmetic routines.
485
486\subsection{The \class{Decimal} type}
487
488A new module, \module{decimal}, was added to Python's standard library.
489It contains two classes, \class{Decimal} and \class{Context}.
490\class{Decimal} instances represent numbers, and
491\class{Context} instances are used to wrap up various settings such as the precision and default rounding mode.
492
493\class{Decimal} instances, like regular Python integers and FP numbers, are immutable; once they've been created, you can't change the value it represents.
494\class{Decimal} instances can be created from integers or strings:
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000495
496\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000497>>> import decimal
498>>> decimal.Decimal(1972)
499Decimal("1972")
500>>> decimal.Decimal("1.1")
501Decimal("1.1")
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000502\end{verbatim}
503
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000504You can also provide tuples containing the sign, mantissa represented
505as a tuple of decimal digits, and exponent:
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000506
507\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000508>>> decimal.Decimal((1, (1, 4, 7, 5), -2))
509Decimal("-14.75")
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000510\end{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000511
512Cautionary note: the sign bit is a Boolean value, so 0 is positive and 1 is negative.
513
514Floating-point numbers posed a bit of a problem: should the FP number
515representing 1.1 turn into the decimal number for exactly 1.1, or for
5161.1 plus whatever inaccuracies are introduced? The decision was to
517leave such a conversion out of the API. Instead, you should convert
518the floating-point number into a string using the desired precision and
519pass the string to the \class{Decimal} constructor:
520
521\begin{verbatim}
522>>> f = 1.1
523>>> decimal.Decimal(str(f))
524Decimal("1.1")
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000525>>> decimal.Decimal('%.12f' % f)
526Decimal("1.100000000000")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000527\end{verbatim}
528
529Once you have \class{Decimal} instances, you can perform the usual
530mathematical operations on them. One limitation: exponentiation
531requires an integer exponent:
532
533\begin{verbatim}
534>>> a = decimal.Decimal('35.72')
535>>> b = decimal.Decimal('1.73')
536>>> a+b
537Decimal("37.45")
538>>> a-b
539Decimal("33.99")
540>>> a*b
541Decimal("61.7956")
542>>> a/b
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000543Decimal("20.64739884393063583815028902")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000544>>> a ** 2
545Decimal("1275.9184")
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000546>>> a**b
547Traceback (most recent call last):
548 ...
549decimal.InvalidOperation: x ** (non-integer)
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000550\end{verbatim}
551
552You can combine \class{Decimal} instances with integers, but not with
553floating-point numbers:
554
555\begin{verbatim}
556>>> a + 4
557Decimal("39.72")
558>>> a + 4.5
559Traceback (most recent call last):
560 ...
561TypeError: You can interact Decimal only with int, long or Decimal data types.
562>>>
563\end{verbatim}
564
565\class{Decimal} numbers can be used with the \module{math} and
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000566\module{cmath} modules, but note that they'll be immediately converted to
567floating-point numbers before the operation is performed, resulting in
568a possible loss of precision and accuracy. You'll also get back a
569regular floating-point number and not a \class{Decimal}.
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000570
571\begin{verbatim}
572>>> import math, cmath
573>>> d = decimal.Decimal('123456789012.345')
574>>> math.sqrt(d)
575351364.18288201344
576>>> cmath.sqrt(-d)
577351364.18288201344j
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000578\end{verbatim}
579
580Instances also have a \method{sqrt()} method that returns a
581\class{Decimal}, but if you need other things such as trigonometric
582functions you'll have to implement them.
583
584\begin{verbatim}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000585>>> d.sqrt()
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000586Decimal("351364.1828820134592177245001")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000587\end{verbatim}
588
589
590\subsection{The \class{Context} type}
591
592Instances of the \class{Context} class encapsulate several settings for
593decimal operations:
594
595\begin{itemize}
596 \item \member{prec} is the precision, the number of decimal places.
597 \item \member{rounding} specifies the rounding mode. The \module{decimal}
598 module has constants for the various possibilities:
599 \constant{ROUND_DOWN}, \constant{ROUND_CEILING}, \constant{ROUND_HALF_EVEN}, and various others.
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000600 \item \member{traps} is a dictionary specifying what happens on
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000601encountering certain error conditions: either an exception is raised or
602a value is returned. Some examples of error conditions are
603division by zero, loss of precision, and overflow.
604\end{itemize}
605
606There's a thread-local default context available by calling
607\function{getcontext()}; you can change the properties of this context
608to alter the default precision, rounding, or trap handling.
609
610\begin{verbatim}
611>>> decimal.getcontext().prec
61228
613>>> decimal.Decimal(1) / decimal.Decimal(7)
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000614Decimal("0.1428571428571428571428571429")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000615>>> decimal.getcontext().prec = 9
616>>> decimal.Decimal(1) / decimal.Decimal(7)
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000617Decimal("0.142857143")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000618\end{verbatim}
619
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000620The default action for error conditions is selectable; the module can
621either return a special value such as infinity or not-a-number, or
622exceptions can be raised:
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000623
624\begin{verbatim}
625>>> decimal.Decimal(1) / decimal.Decimal(0)
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000626Traceback (most recent call last):
627 ...
628decimal.DivisionByZero: x / 0
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000629>>> decimal.getcontext().traps[decimal.DivisionByZero] = False
630>>> decimal.Decimal(1) / decimal.Decimal(0)
631Decimal("Infinity")
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000632>>>
633\end{verbatim}
634
635The \class{Context} instance also has various methods for formatting
636numbers such as \method{to_eng_string()} and \method{to_sci_string()}.
637
Andrew M. Kuchling0ad20f12004-07-21 13:00:06 +0000638For more information, see the documentation for the \module{decimal}
639module, which includes a quick-start tutorial and a reference.
640
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000641\begin{seealso}
642\seepep{327}{Decimal Data Type}{Written by Facundo Batista and implemented
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000643 by Facundo Batista, Eric Price, Raymond Hettinger, Aahz, and Tim Peters.}
644
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000645\seeurl{http://research.microsoft.com/\textasciitilde hollasch/cgindex/coding/ieeefloat.html}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000646{A more detailed overview of the IEEE-754 representation.}
647
648\seeurl{http://www.lahey.com/float.htm}
649{The article uses Fortran code to illustrate many of the problems
650that floating-point inaccuracy can cause.}
651
652\seeurl{http://www2.hursley.ibm.com/decimal/}
653{A description of a decimal-based representation. This representation
654is being proposed as a standard, and underlies the new Python decimal
655type. Much of this material was written by Mike Cowlishaw, designer of the
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000656Rexx language.}
Andrew M. Kuchlingc8f8a812004-07-04 01:26:42 +0000657
Raymond Hettinger0fff62f2004-07-01 11:52:15 +0000658\end{seealso}
659
660
661%======================================================================
Andrew M. Kuchling65a33322004-07-21 12:41:38 +0000662\section{PEP 331: Locale-Independent Float/String Conversions}
663
664The \module{locale} modules lets Python software select various
665conversions and display conventions that are localized to a particular
666country or language. However, the module was careful to not change
667the numeric locale because various functions in Python's
668implementation required that the numeric locale remain set to the
669\code{'C'} locale. Often this was because the code was using the C library's
670\cfunction{atof()} function.
671
672Not setting the numeric locale caused trouble for extensions that used
673third-party C libraries, however, because they wouldn't have the
674correct locale set. The motivating example was GTK+, whose user
675interface widgets weren't displaying numbers in the current locale.
676
677The solution described in the PEP is to add three new functions to the
678Python API that perform ASCII-only conversions, ignoring the locale
679setting:
680
681\begin{itemize}
682 \item \cfunction{PyOS_ascii_strtod(\var{str}, \var{ptr})}
683and \cfunction{PyOS_ascii_atof(\var{str}, \var{ptr})}
684both convert a string to a C \ctype{double}.
685 \item \cfunction{PyOS_ascii_formatd(\var{buffer}, \var{buf_len}, \var{format}, \var{d})} converts a \ctype{double} to an ASCII string.
686\end{itemize}
687
688The code for these functions came from the GLib library
689(\url{http://developer.gnome.org/arch/gtk/glib.html}), whose
690developers kindly relicensed the relevant functions and donated them
691to the Python Software Foundation. The \module{locale} module
692can now change the numeric locale, letting extensions such as GTK+
693produce the correct results.
694
695\begin{seealso}
696\seepep{331}{Locale-Independent Float/String Conversions}{Written by Christian R. Reis, and implemented by Gustavo Carneiro.}
697\end{seealso}
698
699%======================================================================
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000700\section{Other Language Changes}
701
702Here are all of the changes that Python 2.4 makes to the core Python
703language.
704
705\begin{itemize}
Raymond Hettingerd4462302003-11-26 17:52:45 +0000706
Raymond Hettinger31017ae2004-03-04 08:25:44 +0000707\item The \method{dict.update()} method now accepts the same
708argument forms as the \class{dict} constructor. This includes any
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +0000709mapping, any iterable of key/value pairs, and keyword arguments.
Raymond Hettinger31017ae2004-03-04 08:25:44 +0000710
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000711\item The string methods \method{ljust()}, \method{rjust()}, and
Andrew M. Kuchling67087562003-11-26 18:03:48 +0000712\method{center()} now take an optional argument for specifying a
Raymond Hettingerd4462302003-11-26 17:52:45 +0000713fill character other than a space.
714
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +0000715\item Strings also gained an \method{rsplit()} method that
Raymond Hettingered54d912003-12-31 01:59:18 +0000716works like the \method{split()} method but splits from the end of
Andrew M. Kuchling44a31e12004-01-01 18:33:34 +0000717the string.
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +0000718
719\begin{verbatim}
Raymond Hettinger7a6d2972004-02-13 19:00:07 +0000720>>> 'www.python.org'.split('.', 1)
721['www', 'python.org']
722'www.python.org'.rsplit('.', 1)
723['www.python', 'org']
724\end{verbatim}
Raymond Hettinger97ef8de2004-01-05 00:29:57 +0000725
Andrew M. Kuchling2fb4d512003-10-21 12:31:16 +0000726\item The \method{sort()} method of lists gained three keyword
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000727arguments: \var{cmp}, \var{key}, and \var{reverse}. These arguments
Andrew M. Kuchling2fb4d512003-10-21 12:31:16 +0000728make some common usages of \method{sort()} simpler. All are optional.
729
730\var{cmp} is the same as the previous single argument to
731\method{sort()}; if provided, the value should be a comparison
732function that takes two arguments and returns -1, 0, or +1 depending
733on how the arguments compare.
734
735\var{key} should be a single-argument function that takes a list
736element and returns a comparison key for the element. The list is
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000737then sorted using the comparison keys. The following example sorts a
738list case-insensitively:
Andrew M. Kuchling2fb4d512003-10-21 12:31:16 +0000739
740\begin{verbatim}
741>>> L = ['A', 'b', 'c', 'D']
742>>> L.sort() # Case-sensitive sort
743>>> L
744['A', 'D', 'b', 'c']
745>>> L.sort(key=lambda x: x.lower())
746>>> L
747['A', 'b', 'c', 'D']
748>>> L.sort(cmp=lambda x,y: cmp(x.lower(), y.lower()))
749>>> L
750['A', 'b', 'c', 'D']
751\end{verbatim}
752
753The last example, which uses the \var{cmp} parameter, is the old way
Raymond Hettingered54d912003-12-31 01:59:18 +0000754to perform a case-insensitive sort. It works but is slower than
Andrew M. Kuchling2fb4d512003-10-21 12:31:16 +0000755using a \var{key} parameter. Using \var{key} results in calling the
756\method{lower()} method once for each element in the list while using
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000757\var{cmp} will call it twice for each comparison.
Andrew M. Kuchling2fb4d512003-10-21 12:31:16 +0000758
Andrew M. Kuchling981a9182003-11-13 21:33:26 +0000759For simple key functions and comparison functions, it is often
760possible to avoid a \keyword{lambda} expression by using an unbound
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000761method instead. For example, the above case-insensitive sort is best
762coded as:
763
764\begin{verbatim}
765>>> L.sort(key=str.lower)
766>>> L
767['A', 'b', 'c', 'D']
768\end{verbatim}
769
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000770The \var{reverse} parameter should have a Boolean value. If the value
771is \constant{True}, the list will be sorted into reverse order.
772Instead of \code{L.sort(lambda x,y: cmp(x.score, y.score)) ;
773L.reverse()}, you can now write: \code{L.sort(key = lambda x: x.score,
774reverse=True)}.
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000775
Andrew M. Kuchling981a9182003-11-13 21:33:26 +0000776The results of sorting are now guaranteed to be stable. This means
777that two entries with equal keys will be returned in the same order as
778they were input. For example, you can sort a list of people by name,
779and then sort the list by age, resulting in a list sorted by age where
780people with the same age are in name-sorted order.
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000781
Fred Drake56fcc232004-05-06 02:55:35 +0000782\item There is a new built-in function
783\function{sorted(\var{iterable})} that works like the in-place
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000784\method{list.sort()} method but can be used in
Fred Drake56fcc232004-05-06 02:55:35 +0000785expressions. The differences are:
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000786 \begin{itemize}
Raymond Hettinger7d1dd042003-11-12 16:42:10 +0000787 \item the input may be any iterable;
788 \item a newly formed copy is sorted, leaving the original intact; and
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000789 \item the expression returns the new sorted copy
790 \end{itemize}
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000791
792\begin{verbatim}
793>>> L = [9,7,8,3,2,4,1,6,5]
Raymond Hettinger64958a12003-12-17 20:43:33 +0000794>>> [10+i for i in sorted(L)] # usable in a list comprehension
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000795[11, 12, 13, 14, 15, 16, 17, 18, 19]
Hye-Shik Chang2b052482004-07-17 13:53:48 +0000796>>> L # original is left unchanged
Andrew M. Kuchlinge3e1eca2004-07-26 18:52:48 +0000797[9,7,8,3,2,4,1,6,5]
798>>> sorted('Monty Python') # any iterable may be an input
799[' ', 'M', 'P', 'h', 'n', 'n', 'o', 'o', 't', 't', 'y', 'y']
Raymond Hettingerd4462302003-11-26 17:52:45 +0000800
801>>> # List the contents of a dict sorted by key values
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000802>>> colormap = dict(red=1, blue=2, green=3, black=4, yellow=5)
Raymond Hettinger64958a12003-12-17 20:43:33 +0000803>>> for k, v in sorted(colormap.iteritems()):
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000804... print k, v
805...
806black 4
807blue 2
808green 3
809red 1
810yellow 5
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000811\end{verbatim}
812
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +0000813\item Integer operations will no longer trigger an \exception{OverflowWarning}.
814The \exception{OverflowWarning} warning will disappear in Python 2.5.
815
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +0000816\item The \function{eval(\var{expr}, \var{globals}, \var{locals})}
Andrew M. Kuchling1455f792004-08-02 12:09:58 +0000817and \function{execfile(\var{filename}, \var{globals}, \var{locals})}
818functions and the \keyword{exec} statement now accept any mapping type
819for the \var{locals} argument. Previously this had to be a regular
820Python dictionary. (Contributed by Raymond Hettinger.)
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +0000821
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000822\item The \function{zip()} built-in function and \function{itertools.izip()}
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000823 now return an empty list if called with no arguments.
824 Previously they raised a \exception{TypeError}
825 exception. This makes them more
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000826 suitable for use with variable length argument lists:
827
828\begin{verbatim}
829>>> def transpose(array):
830... return zip(*array)
831...
832>>> transpose([(1,2,3), (4,5,6)])
833[(1, 4), (2, 5), (3, 6)]
834>>> transpose([])
835[]
836\end{verbatim}
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +0000837
Andrew M. Kuchlingd91fcbe2004-08-02 12:44:28 +0000838\item Encountering a failure while importing a module no longer leaves
839a partially-initialized module object in \code{sys.modules}. The
840incomplete module object left behind would fool further imports of the
841same module into succeeding, leading to confusing errors.
842
Andrew M. Kuchling65a33322004-07-21 12:41:38 +0000843\item \constant{None} is now a constant; code that binds a new value to
844the name \samp{None} is now a syntax error.
845
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000846\end{itemize}
847
848
849%======================================================================
850\subsection{Optimizations}
851
852\begin{itemize}
853
Raymond Hettingerca1a7752004-07-12 13:00:45 +0000854\item The inner loops for list and tuple slicing
Andrew M. Kuchling65a33322004-07-21 12:41:38 +0000855 were optimized and now run about one-third faster. The inner loops
856 were also optimized for dictionaries, resulting in performance boosts for
857 \method{keys()}, \method{values()}, \method{items()},
858 \method{iterkeys()}, \method{itervalues()}, and \method{iteritems()}.
Raymond Hettingerb7d05db2004-03-08 07:25:05 +0000859
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000860\item The machinery for growing and shrinking lists was optimized for
861 speed and for space efficiency. Appending and popping from lists now
862 runs faster due to more efficient code paths and less frequent use of
863 the underlying system \cfunction{realloc()}. List comprehensions
864 also benefit. \method{list.extend()} was also optimized and no
865 longer converts its argument into a temporary list before extending
866 the base list.
Raymond Hettinger7a6d2972004-02-13 19:00:07 +0000867
Raymond Hettinger97ef8de2004-01-05 00:29:57 +0000868\item \function{list()}, \function{tuple()}, \function{map()},
869 \function{filter()}, and \function{zip()} now run several times
870 faster with non-sequence arguments that supply a \method{__len__()}
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000871 method.
Raymond Hettinger97ef8de2004-01-05 00:29:57 +0000872
Raymond Hettinger23a0f4e2004-01-05 08:15:20 +0000873\item The methods \method{list.__getitem__()},
Raymond Hettinger97ef8de2004-01-05 00:29:57 +0000874 \method{dict.__getitem__()}, and \method{dict.__contains__()} are
875 are now implemented as \class{method_descriptor} objects rather
876 than \class{wrapper_descriptor} objects. This form of optimized
877 access doubles their performance and makes them more suitable for
Raymond Hettinger23a0f4e2004-01-05 08:15:20 +0000878 use as arguments to functionals:
879 \samp{map(mydict.__getitem__, keylist)}.
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000880
Fred Draked6d35d92004-06-03 13:31:22 +0000881\item Added a new opcode, \code{LIST_APPEND}, that simplifies
Raymond Hettingerdd80f762004-03-07 07:31:06 +0000882 the generated bytecode for list comprehensions and speeds them up
883 by about a third.
884
Andrew M. Kuchlingac642872004-08-07 13:13:31 +0000885\item String concatenations in statements of the form \code{s = s +
886"abc"} and \code{s += "abc"} are now performed more efficiently in
887certain circumstances. This optimization won't be present in other
888Python implementations such as Jython, so you shouldn't rely on it;
889using the \method{join()} method of strings is still recommended when
890you want to efficiently glue a large number of strings together.
891
Fred Drakeed0fa3d2003-07-30 19:14:09 +0000892\end{itemize}
893
894The net result of the 2.4 optimizations is that Python 2.4 runs the
895pystone benchmark around XX\% faster than Python 2.3 and YY\% faster
896than Python 2.2.
897
898
899%======================================================================
900\section{New, Improved, and Deprecated Modules}
901
902As usual, Python's standard library received a number of enhancements and
903bug fixes. Here's a partial list of the most notable changes, sorted
904alphabetically by module name. Consult the
905\file{Misc/NEWS} file in the source tree for a more
906complete list of changes, or look through the CVS logs for all the
907details.
908
909\begin{itemize}
910
Anthony Baxter5da4c832004-07-09 16:16:46 +0000911% XXX new email parser
912
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +0000913\item The \module{asyncore} module's \function{loop()} now has a
914 \var{count} parameter that lets you perform a limited number
915 of passes through the polling loop. The default is still to loop
916 forever.
917
Andrew M. Kuchling69f31eb2003-08-13 23:11:04 +0000918\item The \module{curses} modules now supports the ncurses extension
Fred Draked6d35d92004-06-03 13:31:22 +0000919 \function{use_default_colors()}. On platforms where the terminal
920 supports transparency, this makes it possible to use a transparent
921 background. (Contributed by J\"org Lehmann.)
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +0000922
Raymond Hettinger0c410272004-01-05 10:13:35 +0000923\item The \module{bisect} module now has an underlying C implementation
924 for improved performance.
925 (Contributed by Dmitry Vasiliev.)
926
Andrew M. Kuchling5303a962004-01-18 15:55:51 +0000927\item The CJKCodecs collections of East Asian codecs, maintained
928by Hye-Shik Chang, was integrated into 2.4.
929The new encodings are:
930
931\begin{itemize}
Andrew M. Kuchling671c5062004-07-28 15:29:39 +0000932 \item Chinese (PRC): gb2312, gbk, gb18030, big5hkscs, hz
Andrew M. Kuchling5303a962004-01-18 15:55:51 +0000933 \item Chinese (ROC): big5, cp950
Andrew M. Kuchling671c5062004-07-28 15:29:39 +0000934 \item Japanese: cp932, euc-jis-2004, euc-jp,
Andrew M. Kuchling5303a962004-01-18 15:55:51 +0000935euc-jisx0213, iso-2022-jp, iso-2022-jp-1, iso-2022-jp-2,
Andrew M. Kuchling671c5062004-07-28 15:29:39 +0000936 iso-2022-jp-3, iso-2022-jp-ext, iso-2022-jp-2004,
937 shift-jis, shift-jisx0213, shift-jis-2004
Andrew M. Kuchling5303a962004-01-18 15:55:51 +0000938 \item Korean: cp949, euc-kr, johab, iso-2022-kr
939\end{itemize}
940
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +0000941\item Some other new encodings were added: HP Roman8,
942ISO_8859-11, ISO_8859-16, PCTP-154,
Andrew M. Kuchlinge30c4d42004-08-07 13:58:02 +0000943and TIS-620.
944
Andrew M. Kuchlingfd0e4942004-02-09 13:23:34 +0000945\item There is a new \module{collections} module for
946 various specialized collection datatypes.
947 Currently it contains just one type, \class{deque},
948 a double-ended queue that supports efficiently adding and removing
949 elements from either end.
Raymond Hettinger756b3f32004-01-29 06:37:52 +0000950
951\begin{verbatim}
952>>> from collections import deque
953>>> d = deque('ghi') # make a new deque with three items
954>>> d.append('j') # add a new entry to the right side
955>>> d.appendleft('f') # add a new entry to the left side
956>>> d # show the representation of the deque
957deque(['f', 'g', 'h', 'i', 'j'])
958>>> d.pop() # return and remove the rightmost item
959'j'
960>>> d.popleft() # return and remove the leftmost item
961'f'
962>>> list(d) # list the contents of the deque
963['g', 'h', 'i']
964>>> 'h' in d # search the deque
965True
966\end{verbatim}
967
Andrew M. Kuchlingfd0e4942004-02-09 13:23:34 +0000968Several modules now take advantage of \class{collections.deque} for
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000969improved performance, such as the \module{Queue} and
970\module{threading} modules.
Andrew M. Kuchling5303a962004-01-18 15:55:51 +0000971
Fred Drake9f15b5c2004-05-18 04:30:00 +0000972\item The \module{ConfigParser} classes have been enhanced slightly.
973 The \method{read()} method now returns a list of the files that
974 were successfully parsed, and the \method{set()} method raises
975 \exception{TypeError} if passed a \var{value} argument that isn't a
976 string.
977
Raymond Hettinger607c00f2003-11-12 16:27:50 +0000978\item The \module{heapq} module has been converted to C. The resulting
Andrew M. Kuchlingfd0e4942004-02-09 13:23:34 +0000979 tenfold improvement in speed makes the module suitable for handling
Raymond Hettinger33ecffb2004-06-10 05:03:17 +0000980 high volumes of data. In addition, the module has two new functions
981 \function{nlargest()} and \function{nsmallest()} that use heaps to
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +0000982 find the N largest or smallest values in a dataset without the
Raymond Hettinger33ecffb2004-06-10 05:03:17 +0000983 expense of a full sort.
Andrew M. Kuchling1a420252003-11-08 15:58:49 +0000984
Andrew M. Kuchlingce4bae62004-07-27 12:13:25 +0000985\item The \module{imaplib} module now supports IMAP's THREAD command
986(contributed by Yves Dionne) and new \method{deleteacl()} and
987\method{myrights()} methods (contributed by Arnaud Mazin).
Andrew M. Kuchlingdff9dbd2003-11-20 22:22:19 +0000988
Andrew M. Kuchlingad809552003-12-06 23:19:23 +0000989\item The \module{itertools} module gained a
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +0000990 \function{groupby(\var{iterable}\optional{, \var{func}})} function.
Andrew M. Kuchlingad809552003-12-06 23:19:23 +0000991 \var{iterable} returns a succession of elements, and the optional
992 \var{func} is a function that takes an element and returns a key
993 value; if omitted, the key is simply the element itself.
994 \function{groupby()} then groups the elements into subsequences
995 which have matching values of the key, and returns a series of 2-tuples
996 containing the key value and an iterator over the subsequence.
997
998Here's an example. The \var{key} function simply returns whether a
999number is even or odd, so the result of \function{groupby()} is to
1000return consecutive runs of odd or even numbers.
1001
1002\begin{verbatim}
1003>>> import itertools
1004>>> L = [2,4,6, 7,8,9,11, 12, 14]
1005>>> for key_val, it in itertools.groupby(L, lambda x: x % 2):
1006... print key_val, list(it)
1007...
10080 [2, 4, 6]
10091 [7]
10100 [8]
10111 [9, 11]
10120 [12, 14]
1013>>>
1014\end{verbatim}
1015
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +00001016\function{groupby()} is typically used with sorted input. The logic
1017for \function{groupby()} is similar to the \UNIX{} \code{uniq} filter
1018which makes it handy for eliminating, counting, or identifying
1019duplicate elements:
Raymond Hettingerfeb78c92003-12-12 13:13:47 +00001020
1021\begin{verbatim}
1022>>> word = 'abracadabra'
Raymond Hettingered54d912003-12-31 01:59:18 +00001023>>> letters = sorted(word) # Turn string into a sorted list of letters
Raymond Hettinger64958a12003-12-17 20:43:33 +00001024>>> letters
Andrew M. Kuchling4612bc52003-12-16 20:59:37 +00001025['a', 'a', 'a', 'a', 'a', 'b', 'b', 'c', 'd', 'r', 'r']
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +00001026>>> for k, g in itertools.groupby(letters):
1027... print k, list(g)
1028...
1029a ['a', 'a', 'a', 'a', 'a']
1030b ['b', 'b']
1031c ['c']
1032d ['d']
1033r ['r', 'r']
1034>>> # List unique letters
1035>>> [k for k, g in groupby(letters)]
Raymond Hettingerfeb78c92003-12-12 13:13:47 +00001036['a', 'b', 'c', 'd', 'r']
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +00001037>>> # Count letter occurences
1038>>> [(k, len(list(g))) for k, g in groupby(letters)]
Raymond Hettingerfeb78c92003-12-12 13:13:47 +00001039[('a', 5), ('b', 2), ('c', 1), ('d', 1), ('r', 2)]
Raymond Hettingerfeb78c92003-12-12 13:13:47 +00001040\end{verbatim}
1041
Raymond Hettingered54d912003-12-31 01:59:18 +00001042\item \module{itertools} also gained a function named
1043\function{tee(\var{iterator}, \var{N})} that returns \var{N} independent
1044iterators that replicate \var{iterator}. If \var{N} is omitted, the
1045default is 2.
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001046
1047\begin{verbatim}
1048>>> L = [1,2,3]
1049>>> i1, i2 = itertools.tee(L)
1050>>> i1,i2
1051(<itertools.tee object at 0x402c2080>, <itertools.tee object at 0x402c2090>)
Raymond Hettingered54d912003-12-31 01:59:18 +00001052>>> list(i1) # Run the first iterator to exhaustion
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001053[1, 2, 3]
Raymond Hettingered54d912003-12-31 01:59:18 +00001054>>> list(i2) # Run the second iterator to exhaustion
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001055[1, 2, 3]
1056>\end{verbatim}
1057
1058Note that \function{tee()} has to keep copies of the values returned
Raymond Hettingered54d912003-12-31 01:59:18 +00001059by the iterator; in the worst case, it may need to keep all of them.
Andrew M. Kuchling44a31e12004-01-01 18:33:34 +00001060This should therefore be used carefully if the leading iterator
Raymond Hettingered54d912003-12-31 01:59:18 +00001061can run far ahead of the trailing iterator in a long stream of inputs.
Andrew M. Kuchling3bf85f12004-07-05 01:37:07 +00001062If the separation is large, then you might as well use
Raymond Hettingered54d912003-12-31 01:59:18 +00001063\function{list()} instead. When the iterators track closely with one
1064another, \function{tee()} is ideal. Possible applications include
1065bookmarking, windowing, or lookahead iterators.
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001066
Andrew M. Kuchling5785a132004-07-26 19:28:46 +00001067\item A number of functions were added to the \module{locale}
1068module, such as \function{bind_textdomain_codeset()} to specify a
1069particular encoding, and a family of \function{l*gettext()} functions
1070that return messages in the chosen encoding.
1071(Contributed by Gustavo Niemeyer.)
1072
Andrew M. Kuchling23406892004-07-15 11:44:42 +00001073\item The \module{logging} package's \function{basicConfig} function
1074gained some keyword arguments to simplify log configuration. The
1075default behavior is to log messages to standard error, but
1076various keyword arguments can be specified to log to a particular file,
1077change the logging format, or set the logging level. For example:
Andrew M. Kuchlingbcefe692004-07-07 13:01:53 +00001078
1079\begin{verbatim}
1080import logging
1081logging.basicConfig(filename = '/var/log/application.log',
1082 level=0, # Log all messages, including debugging,
1083 format='%(levelname):%(process):%(thread):%(message)')
1084\end{verbatim}
1085
1086Another addition to \module{logging} is a
1087\class{TimedRotatingFileHandler} class which rotates its log files at
1088a timed interval. The module already had \class{RotatingFileHandler},
1089which rotated logs once the file exceeded a certain size. Both
1090classes derive from a new \class{BaseRotatingHandler} class that can
1091be used to implement other rotating handlers.
1092
Andrew M. Kuchling5785a132004-07-26 19:28:46 +00001093\item The \module{nntplib} module's \class{NNTP} class gained
1094\method{description()} and \method{descriptions()} methods to retrieve
1095newsgroup descriptions for a single group or for a range of groups.
1096(Contributed by J\"urgen A. Erhard.)
1097
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001098\item The \module{operator} module gained two new functions,
1099\function{attrgetter(\var{attr})} and \function{itemgetter(\var{index})}.
1100Both functions return callables that take a single argument and return
Raymond Hettingered54d912003-12-31 01:59:18 +00001101the corresponding attribute or item; these callables make excellent
Andrew M. Kuchlingbcefe692004-07-07 13:01:53 +00001102data extractors when used with \function{map()} or
1103\function{sorted()}. For example:
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001104
1105\begin{verbatim}
Raymond Hettingered54d912003-12-31 01:59:18 +00001106>>> L = [('c', 2), ('d', 1), ('a', 4), ('b', 3)]
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001107>>> map(operator.itemgetter(0), L)
1108['c', 'd', 'a', 'b']
1109>>> map(operator.itemgetter(1), L)
Raymond Hettingered54d912003-12-31 01:59:18 +00001110[2, 1, 4, 3]
1111>>> sorted(L, key=operator.itemgetter(1)) # Sort list by second tuple item
1112[('d', 1), ('c', 2), ('b', 3), ('a', 4)]
Andrew M. Kuchling35f2b052003-12-18 13:28:13 +00001113\end{verbatim}
1114
Andrew M. Kuchlinge30c4d42004-08-07 13:58:02 +00001115\item The \module{optparse} module was updated. The module now passes
1116its messages through \function{gettext.gettext()}, making it possible
1117to internationalize Optik's help and error messages. Help messages
Fred Drake9bae19e2004-08-07 14:28:37 +00001118for options can now include the string \code{'\%default'}, which will
Andrew M. Kuchlinge30c4d42004-08-07 13:58:02 +00001119be replaced by the option's default value.
1120
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +00001121\item A new \function{getsid()} function was added to the
1122\module{posix} module that underlies the \module{os} module.
1123(Contributed by J. Raynor.)
1124
1125\item The \module{poplib} module now supports POP over SSL.
1126
1127\item The \module{profile} module can now profile C extension functions.
1128% XXX more to say about this?
1129
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +00001130\item The \module{random} module has a new method called \method{getrandbits(N)}
Raymond Hettinger607c00f2003-11-12 16:27:50 +00001131 which returns an N-bit long integer. This method supports the existing
1132 \method{randrange()} method, making it possible to efficiently generate
Andrew M. Kuchling44a31e12004-01-01 18:33:34 +00001133 arbitrarily large random numbers.
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +00001134
1135\item The regular expression language accepted by the \module{re} module
1136 was extended with simple conditional expressions, written as
1137 \code{(?(\var{group})\var{A}|\var{B})}. \var{group} is either a
1138 numeric group ID or a group name defined with \code{(?P<group>...)}
1139 earlier in the expression. If the specified group matched, the
1140 regular expression pattern \var{A} will be tested against the string; if
1141 the group didn't match, the pattern \var{B} will be used instead.
Raymond Hettinger874ebd52004-05-31 03:15:02 +00001142
Andrew M. Kuchling7f203b82004-08-09 14:48:28 +00001143\item A new \function{socketpair()} function was added to the
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +00001144\module{socket} module, returning a pair of connected sockets.
1145(Contributed by Dave Cole.)
Andrew M. Kuchling7f203b82004-08-09 14:48:28 +00001146
Anthony Baxter1869df12004-07-12 08:15:37 +00001147% XXX sre is now non-recursive.
1148
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +00001149\item The \function{sys.exitfunc()} function has been deprecated. Code
1150should be using the existing \module{atexit} module, which correctly
1151handles calling multiple exit functions. Eventually
1152\function{sys.exitfunc()} will become a purely internal interface,
1153accessed only by \module{atexit}.
1154
1155\item The \module{tarfile} module now generates GNU-format tar files
1156by default.
1157
Andrew M. Kuchling00457172004-07-15 11:52:40 +00001158\item The \module{threading} module now has an elegantly simple way to support
1159thread-local data. The module contains a \class{local} class whose
1160attribute values are local to different threads.
1161
1162\begin{verbatim}
1163import threading
1164
1165data = threading.local()
1166data.number = 42
1167data.url = ('www.python.org', 80)
1168\end{verbatim}
1169
1170Other threads can assign and retrieve their own values for the
1171\member{number} and \member{url} attributes. You can subclass
1172\class{local} to initialize attributes or to add methods.
1173(Contributed by Jim Fulton.)
1174
Raymond Hettinger874ebd52004-05-31 03:15:02 +00001175\item The \module{weakref} module now supports a wider variety of objects
1176 including Python functions, class instances, sets, frozensets, deques,
1177 arrays, files, sockets, and regular expression pattern objects.
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +00001178
1179\item The \module{xmlrpclib} module now supports a multi-call extension for
Andrew M. Kuchling00457172004-07-15 11:52:40 +00001180transmitting multiple XML-RPC calls in a single HTTP operation.
Andrew M. Kuchling69f31eb2003-08-13 23:11:04 +00001181
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001182\end{itemize}
1183
1184
1185%======================================================================
Raymond Hettingerca1a7752004-07-12 13:00:45 +00001186% whole new modules get described in subsections here
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001187
Martin v. Löwis2a6ba902004-05-31 18:22:40 +00001188\subsection{cookielib}
1189
1190The \module{cookielib} library supports client-side handling for HTTP
1191cookies, just as the \module{Cookie} provides server-side cookie
Andrew M. Kuchling71432f12004-07-05 01:40:07 +00001192support in CGI scripts. Cookies are stored in cookie jars; the library
Martin v. Löwis2a6ba902004-05-31 18:22:40 +00001193transparently stores cookies offered by the web server in the cookie
1194jar, and fetches the cookie from the jar when connecting to the
1195server. Similar to web browsers, policy objects control whether
1196cookies are accepted or not.
1197
1198In order to store cookies across sessions, two implementations of
1199cookie jars are provided: one that stores cookies in the Netscape
1200format, so applications can use the Mozilla or Lynx cookie jars, and
1201one that stores cookies in the same format as the Perl libwww libary.
1202
1203\module{urllib2} has been changed to interact with \module{cookielib}:
1204\class{HTTPCookieProcessor} manages a cookie jar that is used when
1205accessing URLs.
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001206
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +00001207\subsection{doctest}
1208
1209The \module{doctest} module underwent considerable refactoring thanks
1210to Edward Loper and Tim Peters.
1211
1212% XXX describe this
1213
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001214% ======================================================================
1215\section{Build and C API Changes}
1216
1217Changes to Python's build process and to the C API include:
1218
1219\begin{itemize}
1220
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +00001221 \item Three new convenience macros were added for common return
1222 values from extension functions: \csimplemacro{Py_RETURN_NONE},
1223 \csimplemacro{Py_RETURN_TRUE}, and \csimplemacro{Py_RETURN_FALSE}.
1224
Andrew M. Kuchling5785a132004-07-26 19:28:46 +00001225 \item Another new macro, \csimplemacro{Py_CLEAR(\var{obj})},
1226 decreases the reference count of \var{obj} and sets \var{obj} to the
1227 null pointer.
1228
Fred Drakece3caf22004-02-12 18:13:12 +00001229 \item A new function, \cfunction{PyTuple_Pack(\var{N}, \var{obj1},
1230 \var{obj2}, ..., \var{objN})}, constructs tuples from a variable
1231 length argument list of Python objects.
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001232
Fred Drakece3caf22004-02-12 18:13:12 +00001233 \item A new function, \cfunction{PyDict_Contains(\var{d}, \var{k})},
1234 implements fast dictionary lookups without masking exceptions raised
1235 during the look-up process.
Raymond Hettingerd4462302003-11-26 17:52:45 +00001236
Andrew M. Kuchlinge30c4d42004-08-07 13:58:02 +00001237 \item A new function, \cfunction{PyArg_VaParseTupleAndKeywords()},
1238 is the same as \cfunction{PyArg_ParseTupleAndKeywords()} but takes a
1239 \ctype{va_list} instead of a number of arguments.
1240 (Contributed by Greg Chapman.)
1241
Fred Drakece3caf22004-02-12 18:13:12 +00001242 \item A new method flag, \constant{METH_COEXISTS}, allows a function
Andrew M. Kuchling71432f12004-07-05 01:40:07 +00001243 defined in slots to co-exist with a \ctype{PyCFunction} having the
1244 same name. This can halve the access time for a method such as
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +00001245 \method{set.__contains__()}.
1246
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +00001247 \item Python can now be built with additional profiling for the
1248 interpreter itself. This is intended for people developing on the
1249 Python core. Providing \longprogramopt{--enable-profiling} to the
1250 \program{configure} script will let you profile the interpreter with
1251 \program{gprof}, and providing the \longprogramopt{--with-tsc}
1252 switch enables profiling using the Pentium's Time-Stamp-Counter
1253 register. The switch is slightly misnamed, because the profiling
1254 feature also works on the PowerPC platform, though that processor
1255 architecture doesn't called that register the TSC.
1256
Andrew M. Kuchlingd0b6d9d2004-07-04 15:35:00 +00001257 \item The \ctype{tracebackobject} type has been renamed to \ctype{PyTracebackObject}.
Raymond Hettinger97ef8de2004-01-05 00:29:57 +00001258
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001259\end{itemize}
1260
1261
1262%======================================================================
1263\subsection{Port-Specific Changes}
1264
Raymond Hettinger97ef8de2004-01-05 00:29:57 +00001265\begin{itemize}
1266
1267\item The Windows port now builds under MSVC++ 7.1 as well as version 6.
1268
1269\end{itemize}
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001270
1271
1272%======================================================================
1273\section{Other Changes and Fixes \label{section-other}}
1274
1275As usual, there were a bunch of other improvements and bugfixes
1276scattered throughout the source tree. A search through the CVS change
1277logs finds there were XXX patches applied and YYY bugs fixed between
1278Python 2.3 and 2.4. Both figures are likely to be underestimates.
1279
1280Some of the more notable changes are:
1281
1282\begin{itemize}
1283
Raymond Hettinger97ef8de2004-01-05 00:29:57 +00001284\item The \module{timeit} module now automatically disables periodic
1285 garbarge collection during the timing loop. This change makes
1286 consecutive timings more comparable.
1287
1288\item The \module{base64} module now has more complete RFC 3548 support
1289 for Base64, Base32, and Base16 encoding and decoding, including
1290 optional case folding and optional alternative alphabets.
1291 (Contributed by Barry Warsaw.)
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001292
1293\end{itemize}
1294
1295
1296%======================================================================
1297\section{Porting to Python 2.4}
1298
1299This section lists previously described changes that may require
1300changes to your code:
1301
1302\begin{itemize}
1303
Raymond Hettinger607c00f2003-11-12 16:27:50 +00001304\item The \function{zip()} built-in function and \function{itertools.izip()}
1305 now return an empty list instead of raising a \exception{TypeError}
1306 exception if called with no arguments.
Andrew M. Kuchling6aedcfc2003-10-21 12:48:23 +00001307
1308\item \function{dircache.listdir()} now passes exceptions to the caller
1309 instead of returning empty lists.
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001310
Andrew M. Kuchling71432f12004-07-05 01:40:07 +00001311\item \function{LexicalHandler.startDTD()} used to receive the public and
1312 system IDs in the wrong order. This has been corrected; applications
Fred Drake56fcc232004-05-06 02:55:35 +00001313 relying on the wrong order need to be fixed.
Martin v. Löwis456ab1d2004-05-06 01:54:36 +00001314
Andrew M. Kuchling71432f12004-07-05 01:40:07 +00001315\item \function{fcntl.ioctl} now warns if the \var{mutate}
1316 argument is omitted and relevant.
Martin v. Löwis77ca6c42004-06-03 12:47:26 +00001317
Andrew M. Kuchling87c98b22004-08-25 13:38:46 +00001318\item The \module{tarfile} module now generates GNU-format tar files
1319by default.
1320
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001321\end{itemize}
1322
1323
1324%======================================================================
1325\section{Acknowledgements \label{acks}}
1326
1327The author would like to thank the following people for offering
1328suggestions, corrections and assistance with various drafts of this
Andrew M. Kuchling671c5062004-07-28 15:29:39 +00001329article: Hye-Shik Chang, Michael Dyck, Raymond Hettinger.
Fred Drakeed0fa3d2003-07-30 19:14:09 +00001330
1331\end{document}