Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1 | \documentclass{howto} |
| 2 | \usepackage{distutils} |
| 3 | % $Id$ |
| 4 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 5 | % 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 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 9 | \title{What's New in Python 2.4} |
Andrew M. Kuchling | aafdc9c | 2004-12-01 00:46:33 +0000 | [diff] [blame] | 10 | \release{1.02} |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 11 | \author{A.M.\ Kuchling} |
Fred Drake | b914ef0 | 2004-01-02 06:57:50 +0000 | [diff] [blame] | 12 | \authoraddress{ |
| 13 | \strong{Python Software Foundation}\\ |
| 14 | Email: \email{amk@amk.ca} |
| 15 | } |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 16 | |
| 17 | \begin{document} |
| 18 | \maketitle |
| 19 | \tableofcontents |
| 20 | |
Andrew M. Kuchling | 4871535 | 2004-11-30 14:42:24 +0000 | [diff] [blame] | 21 | This article explains the new features in Python 2.4, released on |
| 22 | November~30, 2004. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 23 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 24 | Python 2.4 is a medium-sized release. It doesn't introduce as many |
Andrew M. Kuchling | 3b79091 | 2004-07-04 16:39:40 +0000 | [diff] [blame] | 25 | changes as the radical Python 2.2, but introduces more features than |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 26 | the conservative 2.3 release. The most significant new language |
| 27 | features are function decorators and generator expressions; most other |
| 28 | changes are to the standard library. |
| 29 | |
Andrew M. Kuchling | 7466659 | 2004-11-19 14:26:23 +0000 | [diff] [blame] | 30 | According to the CVS change logs, there were 481 patches applied and |
| 31 | 502 bugs fixed between Python 2.3 and 2.4. Both figures are likely to |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 32 | be underestimates. |
| 33 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 34 | This article doesn't attempt to provide a complete specification of |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 35 | every single new feature, but instead provides a brief introduction to |
| 36 | each feature. For full details, you should refer to the documentation |
| 37 | for Python 2.4, such as the \citetitle[../lib/lib.html]{Python Library |
| 38 | Reference} and the \citetitle[../ref/ref.html]{Python Reference |
| 39 | Manual}. Often you will be referred to the PEP for a particular new |
| 40 | feature for explanations of the implementation and design rationale. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 41 | |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 42 | |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 43 | %====================================================================== |
| 44 | \section{PEP 218: Built-In Set Objects} |
| 45 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 46 | Python 2.3 introduced the \module{sets} module. C implementations of |
| 47 | set data types have now been added to the Python core as two new |
| 48 | built-in types, \function{set(\var{iterable})} and |
| 49 | \function{frozenset(\var{iterable})}. They provide high speed |
| 50 | operations for membership testing, for eliminating duplicates from |
| 51 | sequences, and for mathematical operations like unions, intersections, |
| 52 | differences, and symmetric differences. |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 53 | |
| 54 | \begin{verbatim} |
| 55 | >>> a = set('abracadabra') # form a set from a string |
| 56 | >>> 'z' in a # fast membership testing |
| 57 | False |
| 58 | >>> a # unique letters in a |
| 59 | set(['a', 'r', 'b', 'c', 'd']) |
| 60 | >>> ''.join(a) # convert back into a string |
| 61 | 'arbcd' |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 62 | |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 63 | >>> b = set('alacazam') # form a second set |
| 64 | >>> a - b # letters in a but not in b |
| 65 | set(['r', 'd', 'b']) |
| 66 | >>> a | b # letters in either a or b |
| 67 | set(['a', 'c', 'r', 'd', 'b', 'm', 'z', 'l']) |
| 68 | >>> a & b # letters in both a and b |
| 69 | set(['a', 'c']) |
| 70 | >>> a ^ b # letters in a or b but not both |
| 71 | set(['r', 'd', 'b', 'm', 'z', 'l']) |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 72 | |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 73 | >>> a.add('z') # add a new element |
| 74 | >>> a.update('wxy') # add multiple new elements |
| 75 | >>> a |
| 76 | set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z']) |
| 77 | >>> a.remove('x') # take one element out |
| 78 | >>> a |
| 79 | set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z']) |
| 80 | \end{verbatim} |
| 81 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 82 | The \function{frozenset} type is an immutable version of \function{set}. |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 83 | Since it is immutable and hashable, it may be used as a dictionary key or |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 84 | as a member of another set. |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 85 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 86 | The \module{sets} module remains in the standard library, and may be |
| 87 | useful if you wish to subclass the \class{Set} or \class{ImmutableSet} |
| 88 | classes. There are currently no plans to deprecate the module. |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 89 | |
Raymond Hettinger | 7e0282f | 2003-11-24 07:14:54 +0000 | [diff] [blame] | 90 | \begin{seealso} |
| 91 | \seepep{218}{Adding a Built-In Set Object Type}{Originally proposed by |
| 92 | Greg Wilson and ultimately implemented by Raymond Hettinger.} |
| 93 | \end{seealso} |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 94 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 95 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 96 | %====================================================================== |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 97 | \section{PEP 237: Unifying Long Integers and Integers} |
| 98 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 99 | The lengthy transition process for this PEP, begun in Python 2.2, |
Andrew M. Kuchling | d4be86c | 2004-07-04 01:44:04 +0000 | [diff] [blame] | 100 | takes another step forward in Python 2.4. In 2.3, certain integer |
| 101 | operations that would behave differently after int/long unification |
| 102 | triggered \exception{FutureWarning} warnings and returned values |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 103 | limited to 32 or 64 bits (depending on your platform). In 2.4, these |
| 104 | expressions no longer produce a warning and instead produce a |
| 105 | different result that's usually a long integer. |
Andrew M. Kuchling | d4be86c | 2004-07-04 01:44:04 +0000 | [diff] [blame] | 106 | |
| 107 | The problematic expressions are primarily left shifts and lengthy |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 108 | hexadecimal and octal constants. For example, |
| 109 | \code{2 \textless{}\textless{} 32} results |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 110 | in a warning in 2.3, evaluating to 0 on 32-bit platforms. In Python |
| 111 | 2.4, this expression now returns the correct answer, 8589934592. |
Andrew M. Kuchling | d4be86c | 2004-07-04 01:44:04 +0000 | [diff] [blame] | 112 | |
| 113 | \begin{seealso} |
| 114 | \seepep{237}{Unifying Long Integers and Integers}{Original PEP |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 115 | written by Moshe Zadka and GvR. The changes for 2.4 were implemented by |
Andrew M. Kuchling | d4be86c | 2004-07-04 01:44:04 +0000 | [diff] [blame] | 116 | Kalle Svensson.} |
| 117 | \end{seealso} |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 118 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 119 | |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 120 | %====================================================================== |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 121 | \section{PEP 289: Generator Expressions} |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 122 | |
Andrew M. Kuchling | 38dc2a6 | 2004-08-07 13:24:12 +0000 | [diff] [blame] | 123 | The iterator feature introduced in Python 2.2 and the |
| 124 | \module{itertools} module make it easier to write programs that loop |
| 125 | through large data sets without having the entire data set in memory |
| 126 | at one time. List comprehensions don't fit into this picture very |
| 127 | well because they produce a Python list object containing all of the |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 128 | items. This unavoidably pulls all of the objects into memory, which |
| 129 | can be a problem if your data set is very large. When trying to write |
Andrew M. Kuchling | 38dc2a6 | 2004-08-07 13:24:12 +0000 | [diff] [blame] | 130 | a functionally-styled program, it would be natural to write something |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 131 | like: |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 132 | |
| 133 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 134 | links = [link for link in get_all_links() if not link.followed] |
| 135 | for link in links: |
| 136 | ... |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 137 | \end{verbatim} |
| 138 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 139 | instead of |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 140 | |
| 141 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 142 | for link in get_all_links(): |
| 143 | if link.followed: |
| 144 | continue |
| 145 | ... |
| 146 | \end{verbatim} |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 147 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 148 | The first form is more concise and perhaps more readable, but if |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 149 | you're dealing with a large number of link objects you'd have to write |
| 150 | the second form to avoid having all link objects in memory at the same |
| 151 | time. |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 152 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 153 | Generator expressions work similarly to list comprehensions but don't |
| 154 | materialize the entire list; instead they create a generator that will |
| 155 | return elements one by one. The above example could be written as: |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 156 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 157 | \begin{verbatim} |
| 158 | links = (link for link in get_all_links() if not link.followed) |
| 159 | for link in links: |
| 160 | ... |
| 161 | \end{verbatim} |
Raymond Hettinger | 170a622 | 2004-05-19 19:45:19 +0000 | [diff] [blame] | 162 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 163 | Generator expressions always have to be written inside parentheses, as |
| 164 | in the above example. The parentheses signalling a function call also |
| 165 | count, so if you want to create a iterator that will be immediately |
| 166 | passed to a function you could write: |
Raymond Hettinger | 170a622 | 2004-05-19 19:45:19 +0000 | [diff] [blame] | 167 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 168 | \begin{verbatim} |
| 169 | print sum(obj.count for obj in list_all_objects()) |
| 170 | \end{verbatim} |
Raymond Hettinger | 170a622 | 2004-05-19 19:45:19 +0000 | [diff] [blame] | 171 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 172 | Generator expressions differ from list comprehensions in various small |
| 173 | ways. Most notably, the loop variable (\var{obj} in the above |
| 174 | example) is not accessible outside of the generator expression. List |
| 175 | comprehensions leave the variable assigned to its last value; future |
| 176 | versions of Python will change this, making list comprehensions match |
| 177 | generator expressions in this respect. |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 178 | |
| 179 | \begin{seealso} |
| 180 | \seepep{289}{Generator Expressions}{Proposed by Raymond Hettinger and |
| 181 | implemented by Jiwon Seo with early efforts steered by Hye-Shik Chang.} |
| 182 | \end{seealso} |
| 183 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 184 | |
| 185 | %====================================================================== |
| 186 | \section{PEP 292: Simpler String Substitutions} |
| 187 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 188 | Some new classes in the standard library provide an alternative |
| 189 | mechanism for substituting variables into strings; this style of |
| 190 | substitution may be better for applications where untrained |
| 191 | users need to edit templates. |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 192 | |
| 193 | The usual way of substituting variables by name is the \code{\%} |
| 194 | operator: |
| 195 | |
| 196 | \begin{verbatim} |
| 197 | >>> '%(page)i: %(title)s' % {'page':2, 'title': 'The Best of Times'} |
| 198 | '2: The Best of Times' |
| 199 | \end{verbatim} |
| 200 | |
| 201 | When writing the template string, it can be easy to forget the |
| 202 | \samp{i} or \samp{s} after the closing parenthesis. This isn't a big |
| 203 | problem if the template is in a Python module, because you run the |
| 204 | code, get an ``Unsupported format character'' \exception{ValueError}, |
| 205 | and fix the problem. However, consider an application such as Mailman |
| 206 | where template strings or translations are being edited by users who |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 207 | aren't aware of the Python language. The format string's syntax is |
| 208 | complicated to explain to such users, and if they make a mistake, it's |
| 209 | difficult to provide helpful feedback to them. |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 210 | |
| 211 | PEP 292 adds a \class{Template} class to the \module{string} module |
Andrew M. Kuchling | e2a66bf | 2004-12-01 00:45:15 +0000 | [diff] [blame] | 212 | that uses \samp{\$} to indicate a substitution: |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 213 | |
| 214 | \begin{verbatim} |
| 215 | >>> import string |
| 216 | >>> t = string.Template('$page: $title') |
Andrew M. Kuchling | a79ec22 | 2004-09-10 11:34:39 +0000 | [diff] [blame] | 217 | >>> t.substitute({'page':2, 'title': 'The Best of Times'}) |
Andrew M. Kuchling | e2a66bf | 2004-12-01 00:45:15 +0000 | [diff] [blame] | 218 | '2: The Best of Times' |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 219 | \end{verbatim} |
| 220 | |
| 221 | % $ Terminate $-mode for Emacs |
| 222 | |
Andrew M. Kuchling | a79ec22 | 2004-09-10 11:34:39 +0000 | [diff] [blame] | 223 | If a key is missing from the dictionary, the \method{substitute} method |
| 224 | will raise a \exception{KeyError}. There's also a \method{safe_substitute} |
| 225 | method that ignores missing keys: |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 226 | |
| 227 | \begin{verbatim} |
Andrew M. Kuchling | b69c49c | 2004-12-01 00:42:41 +0000 | [diff] [blame] | 228 | >>> t = string.Template('$page: $title') |
Andrew M. Kuchling | a79ec22 | 2004-09-10 11:34:39 +0000 | [diff] [blame] | 229 | >>> t.safe_substitute({'page':3}) |
Andrew M. Kuchling | e2a66bf | 2004-12-01 00:45:15 +0000 | [diff] [blame] | 230 | '3: $title' |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 231 | \end{verbatim} |
| 232 | |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 233 | % $ Terminate math-mode for Emacs |
| 234 | |
| 235 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 236 | \begin{seealso} |
| 237 | \seepep{292}{Simpler String Substitutions}{Written and implemented |
| 238 | by Barry Warsaw.} |
| 239 | \end{seealso} |
| 240 | |
| 241 | |
Raymond Hettinger | 354433a | 2004-05-19 08:20:33 +0000 | [diff] [blame] | 242 | %====================================================================== |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 243 | \section{PEP 318: Decorators for Functions and Methods} |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 244 | |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 245 | Python 2.2 extended Python's object model by adding static methods and |
| 246 | class methods, but it didn't extend Python's syntax to provide any new |
| 247 | way of defining static or class methods. Instead, you had to write a |
| 248 | \keyword{def} statement in the usual way, and pass the resulting |
| 249 | method to a \function{staticmethod()} or \function{classmethod()} |
| 250 | function that would wrap up the function as a method of the new type. |
| 251 | Your code would look like this: |
| 252 | |
| 253 | \begin{verbatim} |
| 254 | class C: |
| 255 | def meth (cls): |
| 256 | ... |
| 257 | |
| 258 | meth = classmethod(meth) # Rebind name to wrapped-up class method |
| 259 | \end{verbatim} |
| 260 | |
| 261 | If the method was very long, it would be easy to miss or forget the |
| 262 | \function{classmethod()} invocation after the function body. |
| 263 | |
| 264 | The intention was always to add some syntax to make such definitions |
| 265 | more readable, but at the time of 2.2's release a good syntax was not |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 266 | obvious. Today a good syntax \emph{still} isn't obvious but users are |
| 267 | asking for easier access to the feature; a new syntactic feature has |
| 268 | been added to meet this need. |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 269 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 270 | The new feature is called ``function decorators''. The name comes |
| 271 | from the idea that \function{classmethod}, \function{staticmethod}, |
| 272 | and friends are storing additional information on a function object; |
| 273 | they're \emph{decorating} functions with more details. |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 274 | |
Fred Drake | 3f5c654 | 2004-08-06 03:34:20 +0000 | [diff] [blame] | 275 | The notation borrows from Java and uses the \character{@} character as an |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 276 | indicator. Using the new syntax, the example above would be written: |
| 277 | |
| 278 | \begin{verbatim} |
| 279 | class C: |
| 280 | |
| 281 | @classmethod |
| 282 | def meth (cls): |
| 283 | ... |
| 284 | |
| 285 | \end{verbatim} |
| 286 | |
| 287 | The \code{@classmethod} is shorthand for the |
Fred Drake | 3f5c654 | 2004-08-06 03:34:20 +0000 | [diff] [blame] | 288 | \code{meth=classmethod(meth)} assignment. More generally, if you have |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 289 | the following: |
| 290 | |
| 291 | \begin{verbatim} |
Skip Montanaro | 9935e7f | 2004-12-26 15:29:28 +0000 | [diff] [blame^] | 292 | @A |
| 293 | @B |
| 294 | @C |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 295 | def f (): |
| 296 | ... |
| 297 | \end{verbatim} |
| 298 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 299 | It's equivalent to the following pre-decorator code: |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 300 | |
| 301 | \begin{verbatim} |
| 302 | def f(): ... |
Andrew M. Kuchling | cebdd3c | 2004-10-08 18:29:29 +0000 | [diff] [blame] | 303 | f = A(B(C(f))) |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 304 | \end{verbatim} |
| 305 | |
Skip Montanaro | 9935e7f | 2004-12-26 15:29:28 +0000 | [diff] [blame^] | 306 | Decorators must come on the line before a function definition, one decorator |
| 307 | per line, and can't be on the same line as the def statement, meaning that |
| 308 | \code{@A def f(): ...} is illegal. You can only decorate function |
| 309 | definitions, either at the module level or inside a class; you can't |
| 310 | decorate class definitions. |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 311 | |
Skip Montanaro | 9935e7f | 2004-12-26 15:29:28 +0000 | [diff] [blame^] | 312 | A decorator is just a function that takes the function to be decorated as an |
| 313 | argument and returns either the same function or some new object. The |
| 314 | return value of the decorator need not be callable (though it typically is), |
| 315 | unless further decorators will be applied to the result. It's easy to write |
| 316 | your own decorators. The following simple example just sets an attribute on |
| 317 | the function object: |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 318 | |
| 319 | \begin{verbatim} |
| 320 | >>> def deco(func): |
| 321 | ... func.attr = 'decorated' |
| 322 | ... return func |
| 323 | ... |
| 324 | >>> @deco |
| 325 | ... def f(): pass |
| 326 | ... |
| 327 | >>> f |
| 328 | <function f at 0x402ef0d4> |
| 329 | >>> f.attr |
| 330 | 'decorated' |
| 331 | >>> |
| 332 | \end{verbatim} |
| 333 | |
| 334 | As a slightly more realistic example, the following decorator checks |
| 335 | that the supplied argument is an integer: |
| 336 | |
| 337 | \begin{verbatim} |
| 338 | def require_int (func): |
| 339 | def wrapper (arg): |
| 340 | assert isinstance(arg, int) |
| 341 | return func(arg) |
| 342 | |
| 343 | return wrapper |
| 344 | |
| 345 | @require_int |
| 346 | def p1 (arg): |
| 347 | print arg |
| 348 | |
| 349 | @require_int |
| 350 | def p2(arg): |
| 351 | print arg*2 |
| 352 | \end{verbatim} |
| 353 | |
| 354 | An example in \pep{318} contains a fancier version of this idea that |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 355 | lets you both specify the required type and check the returned type. |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 356 | |
| 357 | Decorator functions can take arguments. If arguments are supplied, |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 358 | your decorator function is called with only those arguments and must |
| 359 | return a new decorator function; this function must take a single |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 360 | function and return a function, as previously described. In other |
| 361 | words, \code{@A @B @C(args)} becomes: |
| 362 | |
| 363 | \begin{verbatim} |
| 364 | def f(): ... |
| 365 | _deco = C(args) |
Andrew M. Kuchling | cebdd3c | 2004-10-08 18:29:29 +0000 | [diff] [blame] | 366 | f = A(B(_deco(f))) |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 367 | \end{verbatim} |
| 368 | |
| 369 | Getting this right can be slightly brain-bending, but it's not too |
| 370 | difficult. |
| 371 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 372 | A small related change makes the \member{func_name} attribute of |
| 373 | functions writable. This attribute is used to display function names |
| 374 | in tracebacks, so decorators should change the name of any new |
| 375 | function that's constructed and returned. |
| 376 | |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 377 | \begin{seealso} |
| 378 | \seepep{318}{Decorators for Functions, Methods and Classes}{Written |
Andrew M. Kuchling | 77a602f | 2004-08-02 13:48:18 +0000 | [diff] [blame] | 379 | by Kevin D. Smith, Jim Jewett, and Skip Montanaro. Several people |
| 380 | wrote patches implementing function decorators, but the one that was |
Fred Drake | e72bd4d | 2004-08-02 21:50:26 +0000 | [diff] [blame] | 381 | actually checked in was patch \#979728, written by Mark Russell.} |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 382 | \end{seealso} |
| 383 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 384 | % XXX add link to decorators module in Wiki |
| 385 | |
| 386 | |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 387 | %====================================================================== |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 388 | \section{PEP 322: Reverse Iteration} |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 389 | |
Fred Drake | 56fcc23 | 2004-05-06 02:55:35 +0000 | [diff] [blame] | 390 | A new built-in function, \function{reversed(\var{seq})}, takes a sequence |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 391 | and returns an iterator that loops over the elements of the sequence |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 392 | in reverse order. |
| 393 | |
| 394 | \begin{verbatim} |
Raymond Hettinger | bc3cba2 | 2003-11-12 16:39:30 +0000 | [diff] [blame] | 395 | >>> for i in reversed(xrange(1,4)): |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 396 | ... print i |
| 397 | ... |
| 398 | 3 |
| 399 | 2 |
| 400 | 1 |
| 401 | \end{verbatim} |
| 402 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 403 | Compared to extended slicing, such as \code{range(1,4)[::-1]}, |
| 404 | \function{reversed()} is easier to read, runs faster, and uses |
| 405 | substantially less memory. |
Raymond Hettinger | bc3cba2 | 2003-11-12 16:39:30 +0000 | [diff] [blame] | 406 | |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 407 | Note that \function{reversed()} only accepts sequences, not arbitrary |
Raymond Hettinger | bc3cba2 | 2003-11-12 16:39:30 +0000 | [diff] [blame] | 408 | iterators. If you want to reverse an iterator, first convert it to |
| 409 | a list with \function{list()}. |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 410 | |
| 411 | \begin{verbatim} |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 412 | >>> input = open('/etc/passwd', 'r') |
Andrew M. Kuchling | 44a31e1 | 2004-01-01 18:33:34 +0000 | [diff] [blame] | 413 | >>> for line in reversed(list(input)): |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 414 | ... print line |
| 415 | ... |
| 416 | root:*:0:0:System Administrator:/var/root:/bin/tcsh |
| 417 | ... |
| 418 | \end{verbatim} |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 419 | |
Andrew M. Kuchling | f7a6b67 | 2003-11-08 16:05:37 +0000 | [diff] [blame] | 420 | \begin{seealso} |
| 421 | \seepep{322}{Reverse Iteration}{Written and implemented by Raymond Hettinger.} |
| 422 | |
| 423 | \end{seealso} |
| 424 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 425 | |
| 426 | %====================================================================== |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 427 | \section{PEP 324: New subprocess Module} |
| 428 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 429 | The standard library provides a number of ways to execute a |
| 430 | subprocess, offering different features and different levels of |
| 431 | complexity. \function{os.system(\var{command})} is easy to use, but |
| 432 | slow (it runs a shell process which executes the command) and |
| 433 | dangerous (you have to be careful about escaping the shell's |
| 434 | metacharacters). The \module{popen2} module offers classes that can |
| 435 | capture standard output and standard error from the subprocess, but |
| 436 | the naming is confusing. The \module{subprocess} module cleans |
| 437 | this up, providing a unified interface that offers all the features |
| 438 | you might need. |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 439 | |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 440 | Instead of \module{popen2}'s collection of classes, |
| 441 | \module{subprocess} contains a single class called \class{Popen} |
| 442 | whose constructor supports a number of different keyword arguments. |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 443 | |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 444 | \begin{verbatim} |
| 445 | class Popen(args, bufsize=0, executable=None, |
| 446 | stdin=None, stdout=None, stderr=None, |
| 447 | preexec_fn=None, close_fds=False, shell=False, |
| 448 | cwd=None, env=None, universal_newlines=False, |
| 449 | startupinfo=None, creationflags=0): |
| 450 | \end{verbatim} |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 451 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 452 | \var{args} is commonly a sequence of strings that will be the |
| 453 | arguments to the program executed as the subprocess. (If the |
| 454 | \var{shell} argument is true, \var{args} can be a string which will |
| 455 | then be passed on to the shell for interpretation, just as |
| 456 | \function{os.system()} does.) |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 457 | |
| 458 | \var{stdin}, \var{stdout}, and \var{stderr} specify what the |
| 459 | subprocess's input, output, and error streams will be. You can |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 460 | provide a file object or a file descriptor, or you can use the |
| 461 | constant \code{subprocess.PIPE} to create a pipe between the |
| 462 | subprocess and the parent. |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 463 | |
| 464 | The constructor has a number of handy options: |
| 465 | |
| 466 | \begin{itemize} |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 467 | \item \var{close_fds} requests that all file descriptors be closed |
| 468 | before running the subprocess. |
| 469 | |
| 470 | \item \var{cwd} specifies the working directory in which the |
| 471 | subprocess will be executed (defaulting to whatever the parent's |
| 472 | working directory is). |
| 473 | |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 474 | \item \var{env} is a dictionary specifying environment variables. |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 475 | |
| 476 | \item \var{preexec_fn} is a function that gets called before the |
| 477 | child is started. |
| 478 | |
| 479 | \item \var{universal_newlines} opens the child's input and output |
| 480 | using Python's universal newline feature. |
| 481 | |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 482 | \end{itemize} |
| 483 | |
| 484 | Once you've created the \class{Popen} instance, |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 485 | you can call its \method{wait()} method to pause until the subprocess |
| 486 | has exited, \method{poll()} to check if it's exited without pausing, |
| 487 | or \method{communicate(\var{data})} to send the string \var{data} to |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 488 | the subprocess's standard input. \method{communicate(\var{data})} |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 489 | then reads any data that the subprocess has sent to its standard output |
| 490 | or standard error, returning a tuple \code{(\var{stdout_data}, |
| 491 | \var{stderr_data})}. |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 492 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 493 | \function{call()} is a shortcut that passes its arguments along to the |
| 494 | \class{Popen} constructor, waits for the command to complete, and |
| 495 | returns the status code of the subprocess. It can serve as a safer |
| 496 | analog to \function{os.system()}: |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 497 | |
| 498 | \begin{verbatim} |
| 499 | sts = subprocess.call(['dpkg', '-i', '/tmp/new-package.deb']) |
| 500 | if sts == 0: |
| 501 | # Success |
| 502 | ... |
| 503 | else: |
| 504 | # dpkg returned an error |
| 505 | ... |
| 506 | \end{verbatim} |
| 507 | |
| 508 | The command is invoked without use of the shell. If you really do want to |
| 509 | use the shell, you can add \code{shell=True} as a keyword argument and provide |
| 510 | a string instead of a sequence: |
| 511 | |
| 512 | \begin{verbatim} |
| 513 | sts = subprocess.call('dpkg -i /tmp/new-package.deb', shell=True) |
| 514 | \end{verbatim} |
| 515 | |
| 516 | The PEP takes various examples of shell and Python code and shows how |
| 517 | they'd be translated into Python code that uses \module{subprocess}. |
| 518 | Reading this section of the PEP is highly recommended. |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 519 | |
| 520 | \begin{seealso} |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 521 | \seepep{324}{subprocess - New process module}{Written and implemented by Peter {\AA}strand, with assistance from Fredrik Lundh and others.} |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 522 | \end{seealso} |
| 523 | |
Andrew M. Kuchling | b6ffc27 | 2004-10-12 16:36:57 +0000 | [diff] [blame] | 524 | |
Andrew M. Kuchling | c9e7d77 | 2004-10-12 15:58:02 +0000 | [diff] [blame] | 525 | %====================================================================== |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 526 | \section{PEP 327: Decimal Data Type} |
| 527 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 528 | Python has always supported floating-point (FP) numbers, based on the |
| 529 | underlying C \ctype{double} type, as a data type. However, while most |
Andrew M. Kuchling | 536183b | 2004-11-25 01:15:25 +0000 | [diff] [blame] | 530 | programming languages provide a floating-point type, many people (even |
| 531 | programmers) are unaware that floating-point numbers don't represent |
| 532 | certain decimal fractions accurately. The new \class{Decimal} type |
| 533 | can represent these fractions accurately, up to a user-specified |
| 534 | precision limit. |
| 535 | |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 536 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 537 | \subsection{Why is Decimal needed?} |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 538 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 539 | The limitations arise from the representation used for floating-point numbers. |
| 540 | FP numbers are made up of three components: |
| 541 | |
| 542 | \begin{itemize} |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 543 | \item The sign, which is positive or negative. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 544 | \item The mantissa, which is a single-digit binary number |
| 545 | followed by a fractional part. For example, \code{1.01} in base-2 notation |
| 546 | is \code{1 + 0/2 + 1/4}, or 1.25 in decimal notation. |
| 547 | \item The exponent, which tells where the decimal point is located in the number represented. |
| 548 | \end{itemize} |
| 549 | |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 550 | For example, the number 1.25 has positive sign, a mantissa value of |
| 551 | 1.01 (in binary), and an exponent of 0 (the decimal point doesn't need |
| 552 | to be shifted). The number 5 has the same sign and mantissa, but the |
| 553 | exponent is 2 because the mantissa is multiplied by 4 (2 to the power |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 554 | of the exponent 2); 1.25 * 4 equals 5. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 555 | |
| 556 | Modern systems usually provide floating-point support that conforms to |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 557 | a standard called IEEE 754. C's \ctype{double} type is usually |
| 558 | implemented as a 64-bit IEEE 754 number, which uses 52 bits of space |
| 559 | for the mantissa. This means that numbers can only be specified to 52 |
| 560 | bits of precision. If you're trying to represent numbers whose |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 561 | expansion repeats endlessly, the expansion is cut off after 52 bits. |
| 562 | Unfortunately, most software needs to produce output in base 10, and |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 563 | common fractions in base 10 are often repeating decimals in binary. |
| 564 | For example, 1.1 decimal is binary \code{1.0001100110011 ...}; .1 = |
| 565 | 1/16 + 1/32 + 1/256 plus an infinite number of additional terms. IEEE |
| 566 | 754 has to chop off that infinitely repeated decimal after 52 digits, |
| 567 | so the representation is slightly inaccurate. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 568 | |
| 569 | Sometimes you can see this inaccuracy when the number is printed: |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 570 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 571 | >>> 1.1 |
| 572 | 1.1000000000000001 |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 573 | \end{verbatim} |
| 574 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 575 | The inaccuracy isn't always visible when you print the number because |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 576 | the FP-to-decimal-string conversion is provided by the C library, and |
| 577 | most C libraries try to produce sensible output. Even if it's not |
| 578 | displayed, however, the inaccuracy is still there and subsequent |
| 579 | operations can magnify the error. |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 580 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 581 | For many applications this doesn't matter. If I'm plotting points and |
| 582 | displaying them on my monitor, the difference between 1.1 and |
| 583 | 1.1000000000000001 is too small to be visible. Reports often limit |
| 584 | output to a certain number of decimal places, and if you round the |
| 585 | number to two or three or even eight decimal places, the error is |
| 586 | never apparent. However, for applications where it does matter, |
| 587 | it's a lot of work to implement your own custom arithmetic routines. |
| 588 | |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 589 | Hence, the \class{Decimal} type was created. |
| 590 | |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 591 | \subsection{The \class{Decimal} type} |
| 592 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 593 | A new module, \module{decimal}, was added to Python's standard |
| 594 | library. It contains two classes, \class{Decimal} and |
| 595 | \class{Context}. \class{Decimal} instances represent numbers, and |
| 596 | \class{Context} instances are used to wrap up various settings such as |
| 597 | the precision and default rounding mode. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 598 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 599 | \class{Decimal} instances are immutable, like regular Python integers |
| 600 | and FP numbers; once it's been created, you can't change the value an |
| 601 | instance represents. \class{Decimal} instances can be created from |
| 602 | integers or strings: |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 603 | |
| 604 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 605 | >>> import decimal |
| 606 | >>> decimal.Decimal(1972) |
| 607 | Decimal("1972") |
| 608 | >>> decimal.Decimal("1.1") |
| 609 | Decimal("1.1") |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 610 | \end{verbatim} |
| 611 | |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 612 | You can also provide tuples containing the sign, the mantissa represented |
| 613 | as a tuple of decimal digits, and the exponent: |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 614 | |
| 615 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 616 | >>> decimal.Decimal((1, (1, 4, 7, 5), -2)) |
| 617 | Decimal("-14.75") |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 618 | \end{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 619 | |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 620 | Cautionary note: the sign bit is a Boolean value, so 0 is positive and |
| 621 | 1 is negative. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 622 | |
Andrew M. Kuchling | e34c3bd | 2004-08-31 12:21:44 +0000 | [diff] [blame] | 623 | Converting from floating-point numbers poses a bit of a problem: |
| 624 | should the FP number representing 1.1 turn into the decimal number for |
| 625 | exactly 1.1, or for 1.1 plus whatever inaccuracies are introduced? |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 626 | The decision was to dodge the issue and leave such a conversion out of |
| 627 | the API. Instead, you should convert the floating-point number into a |
| 628 | string using the desired precision and pass the string to the |
| 629 | \class{Decimal} constructor: |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 630 | |
| 631 | \begin{verbatim} |
| 632 | >>> f = 1.1 |
| 633 | >>> decimal.Decimal(str(f)) |
| 634 | Decimal("1.1") |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 635 | >>> decimal.Decimal('%.12f' % f) |
| 636 | Decimal("1.100000000000") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 637 | \end{verbatim} |
| 638 | |
| 639 | Once you have \class{Decimal} instances, you can perform the usual |
| 640 | mathematical operations on them. One limitation: exponentiation |
| 641 | requires an integer exponent: |
| 642 | |
| 643 | \begin{verbatim} |
| 644 | >>> a = decimal.Decimal('35.72') |
| 645 | >>> b = decimal.Decimal('1.73') |
| 646 | >>> a+b |
| 647 | Decimal("37.45") |
| 648 | >>> a-b |
| 649 | Decimal("33.99") |
| 650 | >>> a*b |
| 651 | Decimal("61.7956") |
| 652 | >>> a/b |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 653 | Decimal("20.64739884393063583815028902") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 654 | >>> a ** 2 |
| 655 | Decimal("1275.9184") |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 656 | >>> a**b |
| 657 | Traceback (most recent call last): |
| 658 | ... |
| 659 | decimal.InvalidOperation: x ** (non-integer) |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 660 | \end{verbatim} |
| 661 | |
| 662 | You can combine \class{Decimal} instances with integers, but not with |
| 663 | floating-point numbers: |
| 664 | |
| 665 | \begin{verbatim} |
| 666 | >>> a + 4 |
| 667 | Decimal("39.72") |
| 668 | >>> a + 4.5 |
| 669 | Traceback (most recent call last): |
| 670 | ... |
| 671 | TypeError: You can interact Decimal only with int, long or Decimal data types. |
| 672 | >>> |
| 673 | \end{verbatim} |
| 674 | |
| 675 | \class{Decimal} numbers can be used with the \module{math} and |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 676 | \module{cmath} modules, but note that they'll be immediately converted to |
| 677 | floating-point numbers before the operation is performed, resulting in |
| 678 | a possible loss of precision and accuracy. You'll also get back a |
| 679 | regular floating-point number and not a \class{Decimal}. |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 680 | |
| 681 | \begin{verbatim} |
| 682 | >>> import math, cmath |
| 683 | >>> d = decimal.Decimal('123456789012.345') |
| 684 | >>> math.sqrt(d) |
| 685 | 351364.18288201344 |
| 686 | >>> cmath.sqrt(-d) |
| 687 | 351364.18288201344j |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 688 | \end{verbatim} |
| 689 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 690 | \class{Decimal} instances have a \method{sqrt()} method that |
| 691 | returns a \class{Decimal}, but if you need other things such as |
| 692 | trigonometric functions you'll have to implement them. |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 693 | |
| 694 | \begin{verbatim} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 695 | >>> d.sqrt() |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 696 | Decimal("351364.1828820134592177245001") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 697 | \end{verbatim} |
| 698 | |
| 699 | |
| 700 | \subsection{The \class{Context} type} |
| 701 | |
| 702 | Instances of the \class{Context} class encapsulate several settings for |
| 703 | decimal operations: |
| 704 | |
| 705 | \begin{itemize} |
| 706 | \item \member{prec} is the precision, the number of decimal places. |
| 707 | \item \member{rounding} specifies the rounding mode. The \module{decimal} |
| 708 | module has constants for the various possibilities: |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 709 | \constant{ROUND_DOWN}, \constant{ROUND_CEILING}, |
| 710 | \constant{ROUND_HALF_EVEN}, and various others. |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 711 | \item \member{traps} is a dictionary specifying what happens on |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 712 | encountering certain error conditions: either an exception is raised or |
| 713 | a value is returned. Some examples of error conditions are |
| 714 | division by zero, loss of precision, and overflow. |
| 715 | \end{itemize} |
| 716 | |
| 717 | There's a thread-local default context available by calling |
| 718 | \function{getcontext()}; you can change the properties of this context |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 719 | to alter the default precision, rounding, or trap handling. The |
| 720 | following example shows the effect of changing the precision of the default |
| 721 | context: |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 722 | |
| 723 | \begin{verbatim} |
| 724 | >>> decimal.getcontext().prec |
| 725 | 28 |
| 726 | >>> decimal.Decimal(1) / decimal.Decimal(7) |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 727 | Decimal("0.1428571428571428571428571429") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 728 | >>> decimal.getcontext().prec = 9 |
| 729 | >>> decimal.Decimal(1) / decimal.Decimal(7) |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 730 | Decimal("0.142857143") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 731 | \end{verbatim} |
| 732 | |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 733 | The default action for error conditions is selectable; the module can |
| 734 | either return a special value such as infinity or not-a-number, or |
| 735 | exceptions can be raised: |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 736 | |
| 737 | \begin{verbatim} |
| 738 | >>> decimal.Decimal(1) / decimal.Decimal(0) |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 739 | Traceback (most recent call last): |
| 740 | ... |
| 741 | decimal.DivisionByZero: x / 0 |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 742 | >>> decimal.getcontext().traps[decimal.DivisionByZero] = False |
| 743 | >>> decimal.Decimal(1) / decimal.Decimal(0) |
| 744 | Decimal("Infinity") |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 745 | >>> |
| 746 | \end{verbatim} |
| 747 | |
| 748 | The \class{Context} instance also has various methods for formatting |
| 749 | numbers such as \method{to_eng_string()} and \method{to_sci_string()}. |
| 750 | |
Andrew M. Kuchling | 0ad20f1 | 2004-07-21 13:00:06 +0000 | [diff] [blame] | 751 | For more information, see the documentation for the \module{decimal} |
| 752 | module, which includes a quick-start tutorial and a reference. |
| 753 | |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 754 | \begin{seealso} |
| 755 | \seepep{327}{Decimal Data Type}{Written by Facundo Batista and implemented |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 756 | by Facundo Batista, Eric Price, Raymond Hettinger, Aahz, and Tim Peters.} |
| 757 | |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 758 | \seeurl{http://research.microsoft.com/\textasciitilde hollasch/cgindex/coding/ieeefloat.html} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 759 | {A more detailed overview of the IEEE-754 representation.} |
| 760 | |
| 761 | \seeurl{http://www.lahey.com/float.htm} |
| 762 | {The article uses Fortran code to illustrate many of the problems |
| 763 | that floating-point inaccuracy can cause.} |
| 764 | |
| 765 | \seeurl{http://www2.hursley.ibm.com/decimal/} |
| 766 | {A description of a decimal-based representation. This representation |
| 767 | is being proposed as a standard, and underlies the new Python decimal |
| 768 | type. Much of this material was written by Mike Cowlishaw, designer of the |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 769 | Rexx language.} |
Andrew M. Kuchling | c8f8a81 | 2004-07-04 01:26:42 +0000 | [diff] [blame] | 770 | |
Raymond Hettinger | 0fff62f | 2004-07-01 11:52:15 +0000 | [diff] [blame] | 771 | \end{seealso} |
| 772 | |
| 773 | |
| 774 | %====================================================================== |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 775 | \section{PEP 328: Multi-line Imports} |
| 776 | |
| 777 | One language change is a small syntactic tweak aimed at making it |
| 778 | easier to import many names from a module. In a |
| 779 | \code{from \var{module} import \var{names}} statement, |
| 780 | \var{names} is a sequence of names separated by commas. If the sequence is |
| 781 | very long, you can either write multiple imports from the same module, |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 782 | or you can use backslashes to escape the line endings like this: |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 783 | |
| 784 | \begin{verbatim} |
| 785 | from SimpleXMLRPCServer import SimpleXMLRPCServer,\ |
| 786 | SimpleXMLRPCRequestHandler,\ |
| 787 | CGIXMLRPCRequestHandler,\ |
| 788 | resolve_dotted_attribute |
| 789 | \end{verbatim} |
| 790 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 791 | The syntactic change in Python 2.4 simply allows putting the names |
| 792 | within parentheses. Python ignores newlines within a parenthesized |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 793 | expression, so the backslashes are no longer needed: |
| 794 | |
| 795 | \begin{verbatim} |
| 796 | from SimpleXMLRPCServer import (SimpleXMLRPCServer, |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 797 | SimpleXMLRPCRequestHandler, |
| 798 | CGIXMLRPCRequestHandler, |
| 799 | resolve_dotted_attribute) |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 800 | \end{verbatim} |
| 801 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 802 | The PEP also proposes that all \keyword{import} statements be absolute |
| 803 | imports, with a leading \samp{.} character to indicate a relative |
| 804 | import. This part of the PEP is not yet implemented, and will have to |
| 805 | wait for Python 2.5 or some other future version. |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 806 | |
| 807 | \begin{seealso} |
Fred Drake | 410eb84 | 2004-09-01 04:05:08 +0000 | [diff] [blame] | 808 | \seepep{328}{Imports: Multi-Line and Absolute/Relative} |
| 809 | {Written by Aahz. Multi-line imports were implemented by |
| 810 | Dima Dorfman.} |
| 811 | \end{seealso} |
Andrew M. Kuchling | 3294e9d | 2004-08-31 11:26:23 +0000 | [diff] [blame] | 812 | |
| 813 | |
| 814 | %====================================================================== |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 815 | \section{PEP 331: Locale-Independent Float/String Conversions} |
| 816 | |
| 817 | The \module{locale} modules lets Python software select various |
| 818 | conversions and display conventions that are localized to a particular |
| 819 | country or language. However, the module was careful to not change |
| 820 | the numeric locale because various functions in Python's |
| 821 | implementation required that the numeric locale remain set to the |
| 822 | \code{'C'} locale. Often this was because the code was using the C library's |
| 823 | \cfunction{atof()} function. |
| 824 | |
| 825 | Not setting the numeric locale caused trouble for extensions that used |
| 826 | third-party C libraries, however, because they wouldn't have the |
| 827 | correct locale set. The motivating example was GTK+, whose user |
| 828 | interface widgets weren't displaying numbers in the current locale. |
| 829 | |
| 830 | The solution described in the PEP is to add three new functions to the |
| 831 | Python API that perform ASCII-only conversions, ignoring the locale |
| 832 | setting: |
| 833 | |
| 834 | \begin{itemize} |
| 835 | \item \cfunction{PyOS_ascii_strtod(\var{str}, \var{ptr})} |
| 836 | and \cfunction{PyOS_ascii_atof(\var{str}, \var{ptr})} |
| 837 | both convert a string to a C \ctype{double}. |
| 838 | \item \cfunction{PyOS_ascii_formatd(\var{buffer}, \var{buf_len}, \var{format}, \var{d})} converts a \ctype{double} to an ASCII string. |
| 839 | \end{itemize} |
| 840 | |
| 841 | The code for these functions came from the GLib library |
| 842 | (\url{http://developer.gnome.org/arch/gtk/glib.html}), whose |
| 843 | developers kindly relicensed the relevant functions and donated them |
| 844 | to the Python Software Foundation. The \module{locale} module |
| 845 | can now change the numeric locale, letting extensions such as GTK+ |
| 846 | produce the correct results. |
| 847 | |
| 848 | \begin{seealso} |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 849 | \seepep{331}{Locale-Independent Float/String Conversions} |
| 850 | {Written by Christian R. Reis, and implemented by Gustavo Carneiro.} |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 851 | \end{seealso} |
| 852 | |
| 853 | %====================================================================== |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 854 | \section{Other Language Changes} |
| 855 | |
| 856 | Here are all of the changes that Python 2.4 makes to the core Python |
| 857 | language. |
| 858 | |
| 859 | \begin{itemize} |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 860 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 861 | \item Decorators for functions and methods were added (\pep{318}). |
| 862 | |
| 863 | \item Built-in \function{set} and \function{frozenset} types were |
| 864 | added (\pep{218}). Other new built-ins include the \function{reversed(\var{seq})} function (\pep{322}). |
| 865 | |
| 866 | \item Generator expressions were added (\pep{289}). |
| 867 | |
| 868 | \item Certain numeric expressions no longer return values restricted to 32 or 64 bits (\pep{237}). |
| 869 | |
| 870 | \item You can now put parentheses around the list of names in a |
| 871 | \code{from \var{module} import \var{names}} statement (\pep{328}). |
| 872 | |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 873 | \item The \method{dict.update()} method now accepts the same |
| 874 | argument forms as the \class{dict} constructor. This includes any |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 875 | mapping, any iterable of key/value pairs, and keyword arguments. |
| 876 | (Contributed by Raymond Hettinger.) |
Raymond Hettinger | 31017ae | 2004-03-04 08:25:44 +0000 | [diff] [blame] | 877 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 878 | \item The string methods \method{ljust()}, \method{rjust()}, and |
Andrew M. Kuchling | 6708756 | 2003-11-26 18:03:48 +0000 | [diff] [blame] | 879 | \method{center()} now take an optional argument for specifying a |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 880 | fill character other than a space. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 881 | (Contributed by Raymond Hettinger.) |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 882 | |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 883 | \item Strings also gained an \method{rsplit()} method that |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 884 | works like the \method{split()} method but splits from the end of |
Andrew M. Kuchling | 44a31e1 | 2004-01-01 18:33:34 +0000 | [diff] [blame] | 885 | the string. |
Andrew M. Kuchling | b69c49c | 2004-12-01 00:42:41 +0000 | [diff] [blame] | 886 | (Contributed by Sean Reifschneider.) |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 887 | |
| 888 | \begin{verbatim} |
Raymond Hettinger | 7a6d297 | 2004-02-13 19:00:07 +0000 | [diff] [blame] | 889 | >>> 'www.python.org'.split('.', 1) |
| 890 | ['www', 'python.org'] |
| 891 | 'www.python.org'.rsplit('.', 1) |
| 892 | ['www.python', 'org'] |
| 893 | \end{verbatim} |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 894 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 895 | \item Three keyword parameters, \var{cmp}, \var{key}, and |
| 896 | \var{reverse}, were added to the \method{sort()} method of lists. |
| 897 | These parameters make some common usages of \method{sort()} simpler. |
| 898 | All of these parameters are optional. |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 899 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 900 | For the \var{cmp} parameter, the value should be a comparison function |
| 901 | that takes two parameters and returns -1, 0, or +1 depending on how |
| 902 | the parameters compare. This function will then be used to sort the |
| 903 | list. Previously this was the only parameter that could be provided |
| 904 | to \method{sort()}. |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 905 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 906 | \var{key} should be a single-parameter function that takes a list |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 907 | element and returns a comparison key for the element. The list is |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 908 | then sorted using the comparison keys. The following example sorts a |
| 909 | list case-insensitively: |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 910 | |
| 911 | \begin{verbatim} |
| 912 | >>> L = ['A', 'b', 'c', 'D'] |
| 913 | >>> L.sort() # Case-sensitive sort |
| 914 | >>> L |
| 915 | ['A', 'D', 'b', 'c'] |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 916 | >>> # Using 'key' parameter to sort list |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 917 | >>> L.sort(key=lambda x: x.lower()) |
| 918 | >>> L |
| 919 | ['A', 'b', 'c', 'D'] |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 920 | >>> # Old-fashioned way |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 921 | >>> L.sort(cmp=lambda x,y: cmp(x.lower(), y.lower())) |
| 922 | >>> L |
| 923 | ['A', 'b', 'c', 'D'] |
| 924 | \end{verbatim} |
| 925 | |
| 926 | The last example, which uses the \var{cmp} parameter, is the old way |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 927 | to perform a case-insensitive sort. It works but is slower than using |
| 928 | a \var{key} parameter. Using \var{key} calls \method{lower()} method |
| 929 | once for each element in the list while using \var{cmp} will call it |
| 930 | twice for each comparison, so using \var{key} saves on invocations of |
| 931 | the \method{lower()} method. |
Andrew M. Kuchling | 2fb4d51 | 2003-10-21 12:31:16 +0000 | [diff] [blame] | 932 | |
Andrew M. Kuchling | 981a918 | 2003-11-13 21:33:26 +0000 | [diff] [blame] | 933 | For simple key functions and comparison functions, it is often |
| 934 | possible to avoid a \keyword{lambda} expression by using an unbound |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 935 | method instead. For example, the above case-insensitive sort is best |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 936 | written as: |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 937 | |
| 938 | \begin{verbatim} |
| 939 | >>> L.sort(key=str.lower) |
| 940 | >>> L |
| 941 | ['A', 'b', 'c', 'D'] |
| 942 | \end{verbatim} |
| 943 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 944 | Finally, the \var{reverse} parameter takes a Boolean value. If the |
| 945 | value is true, the list will be sorted into reverse order. |
| 946 | Instead of \code{L.sort() ; L.reverse()}, you can now write |
| 947 | \code{L.sort(reverse=True)}. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 948 | |
Andrew M. Kuchling | 981a918 | 2003-11-13 21:33:26 +0000 | [diff] [blame] | 949 | The results of sorting are now guaranteed to be stable. This means |
| 950 | that two entries with equal keys will be returned in the same order as |
| 951 | they were input. For example, you can sort a list of people by name, |
| 952 | and then sort the list by age, resulting in a list sorted by age where |
| 953 | people with the same age are in name-sorted order. |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 954 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 955 | (All changes to \method{sort()} contributed by Raymond Hettinger.) |
| 956 | |
Fred Drake | 56fcc23 | 2004-05-06 02:55:35 +0000 | [diff] [blame] | 957 | \item There is a new built-in function |
| 958 | \function{sorted(\var{iterable})} that works like the in-place |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 959 | \method{list.sort()} method but can be used in |
Fred Drake | 56fcc23 | 2004-05-06 02:55:35 +0000 | [diff] [blame] | 960 | expressions. The differences are: |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 961 | \begin{itemize} |
Raymond Hettinger | 7d1dd04 | 2003-11-12 16:42:10 +0000 | [diff] [blame] | 962 | \item the input may be any iterable; |
| 963 | \item a newly formed copy is sorted, leaving the original intact; and |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 964 | \item the expression returns the new sorted copy |
| 965 | \end{itemize} |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 966 | |
| 967 | \begin{verbatim} |
| 968 | >>> L = [9,7,8,3,2,4,1,6,5] |
Raymond Hettinger | 64958a1 | 2003-12-17 20:43:33 +0000 | [diff] [blame] | 969 | >>> [10+i for i in sorted(L)] # usable in a list comprehension |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 970 | [11, 12, 13, 14, 15, 16, 17, 18, 19] |
Hye-Shik Chang | 2b05248 | 2004-07-17 13:53:48 +0000 | [diff] [blame] | 971 | >>> L # original is left unchanged |
Andrew M. Kuchling | e3e1eca | 2004-07-26 18:52:48 +0000 | [diff] [blame] | 972 | [9,7,8,3,2,4,1,6,5] |
| 973 | >>> sorted('Monty Python') # any iterable may be an input |
| 974 | [' ', 'M', 'P', 'h', 'n', 'n', 'o', 'o', 't', 't', 'y', 'y'] |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 975 | |
| 976 | >>> # List the contents of a dict sorted by key values |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 977 | >>> colormap = dict(red=1, blue=2, green=3, black=4, yellow=5) |
Raymond Hettinger | 64958a1 | 2003-12-17 20:43:33 +0000 | [diff] [blame] | 978 | >>> for k, v in sorted(colormap.iteritems()): |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 979 | ... print k, v |
| 980 | ... |
| 981 | black 4 |
| 982 | blue 2 |
| 983 | green 3 |
| 984 | red 1 |
| 985 | yellow 5 |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 986 | \end{verbatim} |
| 987 | |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 988 | (Contributed by Raymond Hettinger.) |
| 989 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 990 | \item Integer operations will no longer trigger an \exception{OverflowWarning}. |
| 991 | The \exception{OverflowWarning} warning will disappear in Python 2.5. |
| 992 | |
Andrew M. Kuchling | 5e3f923 | 2004-10-07 12:00:33 +0000 | [diff] [blame] | 993 | \item The interpreter gained a new switch, \programopt{-m}, that |
| 994 | takes a name, searches for the corresponding module on \code{sys.path}, |
| 995 | and runs the module as a script. For example, |
| 996 | you can now run the Python profiler with \code{python -m profile}. |
| 997 | (Contributed by Nick Coghlan.) |
| 998 | |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 999 | \item The \function{eval(\var{expr}, \var{globals}, \var{locals})} |
Andrew M. Kuchling | 1455f79 | 2004-08-02 12:09:58 +0000 | [diff] [blame] | 1000 | and \function{execfile(\var{filename}, \var{globals}, \var{locals})} |
| 1001 | functions and the \keyword{exec} statement now accept any mapping type |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1002 | for the \var{locals} parameter. Previously this had to be a regular |
Andrew M. Kuchling | 1455f79 | 2004-08-02 12:09:58 +0000 | [diff] [blame] | 1003 | Python dictionary. (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1004 | |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 1005 | \item The \function{zip()} built-in function and \function{itertools.izip()} |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1006 | now return an empty list if called with no arguments. |
| 1007 | Previously they raised a \exception{TypeError} |
| 1008 | exception. This makes them more |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 1009 | suitable for use with variable length argument lists: |
| 1010 | |
| 1011 | \begin{verbatim} |
| 1012 | >>> def transpose(array): |
| 1013 | ... return zip(*array) |
| 1014 | ... |
| 1015 | >>> transpose([(1,2,3), (4,5,6)]) |
| 1016 | [(1, 4), (2, 5), (3, 6)] |
| 1017 | >>> transpose([]) |
| 1018 | [] |
| 1019 | \end{verbatim} |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1020 | (Contributed by Raymond Hettinger.) |
| 1021 | |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 1022 | \item Encountering a failure while importing a module no longer leaves |
| 1023 | a partially-initialized module object in \code{sys.modules}. The |
| 1024 | incomplete module object left behind would fool further imports of the |
| 1025 | same module into succeeding, leading to confusing errors. |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1026 | (Fixed by Tim Peters.) |
Andrew M. Kuchling | d91fcbe | 2004-08-02 12:44:28 +0000 | [diff] [blame] | 1027 | |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 1028 | \item \constant{None} is now a constant; code that binds a new value to |
| 1029 | the name \samp{None} is now a syntax error. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1030 | (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 1031 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1032 | \end{itemize} |
| 1033 | |
| 1034 | |
| 1035 | %====================================================================== |
| 1036 | \subsection{Optimizations} |
| 1037 | |
| 1038 | \begin{itemize} |
| 1039 | |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 1040 | \item The inner loops for list and tuple slicing |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 1041 | were optimized and now run about one-third faster. The inner loops |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1042 | for dictionaries were also optimized , resulting in performance boosts for |
Andrew M. Kuchling | 65a3332 | 2004-07-21 12:41:38 +0000 | [diff] [blame] | 1043 | \method{keys()}, \method{values()}, \method{items()}, |
| 1044 | \method{iterkeys()}, \method{itervalues()}, and \method{iteritems()}. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1045 | (Contributed by Raymond Hettinger.) |
Raymond Hettinger | b7d05db | 2004-03-08 07:25:05 +0000 | [diff] [blame] | 1046 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1047 | \item The machinery for growing and shrinking lists was optimized for |
| 1048 | speed and for space efficiency. Appending and popping from lists now |
| 1049 | runs faster due to more efficient code paths and less frequent use of |
| 1050 | the underlying system \cfunction{realloc()}. List comprehensions |
| 1051 | also benefit. \method{list.extend()} was also optimized and no |
| 1052 | longer converts its argument into a temporary list before extending |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1053 | the base list. (Contributed by Raymond Hettinger.) |
Raymond Hettinger | 7a6d297 | 2004-02-13 19:00:07 +0000 | [diff] [blame] | 1054 | |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1055 | \item \function{list()}, \function{tuple()}, \function{map()}, |
| 1056 | \function{filter()}, and \function{zip()} now run several times |
| 1057 | faster with non-sequence arguments that supply a \method{__len__()} |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1058 | method. (Contributed by Raymond Hettinger.) |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1059 | |
Raymond Hettinger | 23a0f4e | 2004-01-05 08:15:20 +0000 | [diff] [blame] | 1060 | \item The methods \method{list.__getitem__()}, |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1061 | \method{dict.__getitem__()}, and \method{dict.__contains__()} are |
| 1062 | are now implemented as \class{method_descriptor} objects rather |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1063 | than \class{wrapper_descriptor} objects. This form of |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1064 | access doubles their performance and makes them more suitable for |
Raymond Hettinger | 23a0f4e | 2004-01-05 08:15:20 +0000 | [diff] [blame] | 1065 | use as arguments to functionals: |
| 1066 | \samp{map(mydict.__getitem__, keylist)}. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1067 | (Contributed by Raymond Hettinger.) |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1068 | |
Fred Drake | d6d35d9 | 2004-06-03 13:31:22 +0000 | [diff] [blame] | 1069 | \item Added a new opcode, \code{LIST_APPEND}, that simplifies |
Raymond Hettinger | dd80f76 | 2004-03-07 07:31:06 +0000 | [diff] [blame] | 1070 | the generated bytecode for list comprehensions and speeds them up |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1071 | by about a third. (Contributed by Raymond Hettinger.) |
Raymond Hettinger | dd80f76 | 2004-03-07 07:31:06 +0000 | [diff] [blame] | 1072 | |
Andrew M. Kuchling | 0c78956 | 2004-09-23 20:15:41 +0000 | [diff] [blame] | 1073 | \item The peephole bytecode optimizer has been improved to |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1074 | produce shorter, faster bytecode; remarkably, the resulting bytecode is |
Andrew M. Kuchling | 0c78956 | 2004-09-23 20:15:41 +0000 | [diff] [blame] | 1075 | more readable. (Enhanced by Raymond Hettinger.) |
| 1076 | |
Andrew M. Kuchling | ac64287 | 2004-08-07 13:13:31 +0000 | [diff] [blame] | 1077 | \item String concatenations in statements of the form \code{s = s + |
| 1078 | "abc"} and \code{s += "abc"} are now performed more efficiently in |
| 1079 | certain circumstances. This optimization won't be present in other |
| 1080 | Python implementations such as Jython, so you shouldn't rely on it; |
| 1081 | using the \method{join()} method of strings is still recommended when |
| 1082 | you want to efficiently glue a large number of strings together. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1083 | (Contributed by Armin Rigo.) |
Andrew M. Kuchling | ac64287 | 2004-08-07 13:13:31 +0000 | [diff] [blame] | 1084 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1085 | \end{itemize} |
| 1086 | |
Raymond Hettinger | b2d5a8e | 2004-11-18 05:51:53 +0000 | [diff] [blame] | 1087 | % pystone is almost useless for comparing different versions of Python; |
| 1088 | % instead, it excels at predicting relative Python performance on |
| 1089 | % different machines. |
| 1090 | % So, this section would be more informative if it used other tools |
| 1091 | % such as pybench and parrotbench. For a more application oriented |
| 1092 | % benchmark, try comparing the timings of test_decimal.py under 2.3 |
| 1093 | % and 2.4. |
| 1094 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1095 | The net result of the 2.4 optimizations is that Python 2.4 runs the |
Andrew M. Kuchling | bae8f37 | 2004-11-19 14:55:28 +0000 | [diff] [blame] | 1096 | pystone benchmark around 5\% faster than Python 2.3 and 35\% faster |
| 1097 | than Python 2.2. (pystone is not a particularly good benchmark, but |
| 1098 | it's the most commonly used measurement of Python's performance. Your |
| 1099 | own applications may show greater or smaller benefits from Python~2.4.) |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1100 | |
| 1101 | |
| 1102 | %====================================================================== |
| 1103 | \section{New, Improved, and Deprecated Modules} |
| 1104 | |
| 1105 | As usual, Python's standard library received a number of enhancements and |
| 1106 | bug fixes. Here's a partial list of the most notable changes, sorted |
| 1107 | alphabetically by module name. Consult the |
| 1108 | \file{Misc/NEWS} file in the source tree for a more |
| 1109 | complete list of changes, or look through the CVS logs for all the |
| 1110 | details. |
| 1111 | |
| 1112 | \begin{itemize} |
| 1113 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1114 | \item The \module{asyncore} module's \function{loop()} function now |
| 1115 | has a \var{count} parameter that lets you perform a limited number |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1116 | of passes through the polling loop. The default is still to loop |
| 1117 | forever. |
| 1118 | |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 1119 | \item The \module{base64} module now has more complete RFC 3548 support |
| 1120 | for Base64, Base32, and Base16 encoding and decoding, including |
| 1121 | optional case folding and optional alternative alphabets. |
| 1122 | (Contributed by Barry Warsaw.) |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1123 | |
Raymond Hettinger | 0c41027 | 2004-01-05 10:13:35 +0000 | [diff] [blame] | 1124 | \item The \module{bisect} module now has an underlying C implementation |
| 1125 | for improved performance. |
| 1126 | (Contributed by Dmitry Vasiliev.) |
| 1127 | |
Andrew M. Kuchling | 5303a96 | 2004-01-18 15:55:51 +0000 | [diff] [blame] | 1128 | \item The CJKCodecs collections of East Asian codecs, maintained |
| 1129 | by Hye-Shik Chang, was integrated into 2.4. |
| 1130 | The new encodings are: |
| 1131 | |
| 1132 | \begin{itemize} |
Andrew M. Kuchling | 671c506 | 2004-07-28 15:29:39 +0000 | [diff] [blame] | 1133 | \item Chinese (PRC): gb2312, gbk, gb18030, big5hkscs, hz |
Andrew M. Kuchling | 5303a96 | 2004-01-18 15:55:51 +0000 | [diff] [blame] | 1134 | \item Chinese (ROC): big5, cp950 |
Andrew M. Kuchling | 671c506 | 2004-07-28 15:29:39 +0000 | [diff] [blame] | 1135 | \item Japanese: cp932, euc-jis-2004, euc-jp, |
Andrew M. Kuchling | 5303a96 | 2004-01-18 15:55:51 +0000 | [diff] [blame] | 1136 | euc-jisx0213, iso-2022-jp, iso-2022-jp-1, iso-2022-jp-2, |
Andrew M. Kuchling | 671c506 | 2004-07-28 15:29:39 +0000 | [diff] [blame] | 1137 | iso-2022-jp-3, iso-2022-jp-ext, iso-2022-jp-2004, |
| 1138 | shift-jis, shift-jisx0213, shift-jis-2004 |
Andrew M. Kuchling | 5303a96 | 2004-01-18 15:55:51 +0000 | [diff] [blame] | 1139 | \item Korean: cp949, euc-kr, johab, iso-2022-kr |
| 1140 | \end{itemize} |
| 1141 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1142 | \item Some other new encodings were added: HP Roman8, |
| 1143 | ISO_8859-11, ISO_8859-16, PCTP-154, and TIS-620. |
| 1144 | |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1145 | \item The UTF-8 and UTF-16 codecs now cope better with receiving partial input. |
| 1146 | Previously the \class{StreamReader} class would try to read more data, |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1147 | making it impossible to resume decoding from the stream. The |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1148 | \method{read()} method will now return as much data as it can and future |
| 1149 | calls will resume decoding where previous ones left off. |
| 1150 | (Implemented by Walter D\"orwald.) |
| 1151 | |
Andrew M. Kuchling | fd0e494 | 2004-02-09 13:23:34 +0000 | [diff] [blame] | 1152 | \item There is a new \module{collections} module for |
| 1153 | various specialized collection datatypes. |
| 1154 | Currently it contains just one type, \class{deque}, |
| 1155 | a double-ended queue that supports efficiently adding and removing |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1156 | elements from either end: |
Raymond Hettinger | 756b3f3 | 2004-01-29 06:37:52 +0000 | [diff] [blame] | 1157 | |
| 1158 | \begin{verbatim} |
| 1159 | >>> from collections import deque |
| 1160 | >>> d = deque('ghi') # make a new deque with three items |
| 1161 | >>> d.append('j') # add a new entry to the right side |
| 1162 | >>> d.appendleft('f') # add a new entry to the left side |
| 1163 | >>> d # show the representation of the deque |
| 1164 | deque(['f', 'g', 'h', 'i', 'j']) |
| 1165 | >>> d.pop() # return and remove the rightmost item |
| 1166 | 'j' |
| 1167 | >>> d.popleft() # return and remove the leftmost item |
| 1168 | 'f' |
| 1169 | >>> list(d) # list the contents of the deque |
| 1170 | ['g', 'h', 'i'] |
| 1171 | >>> 'h' in d # search the deque |
| 1172 | True |
| 1173 | \end{verbatim} |
| 1174 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1175 | Several modules, such as the \module{Queue} and \module{threading} |
| 1176 | modules, now take advantage of \class{collections.deque} for improved |
| 1177 | performance. (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | 5303a96 | 2004-01-18 15:55:51 +0000 | [diff] [blame] | 1178 | |
Fred Drake | 9f15b5c | 2004-05-18 04:30:00 +0000 | [diff] [blame] | 1179 | \item The \module{ConfigParser} classes have been enhanced slightly. |
| 1180 | The \method{read()} method now returns a list of the files that |
| 1181 | were successfully parsed, and the \method{set()} method raises |
| 1182 | \exception{TypeError} if passed a \var{value} argument that isn't a |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1183 | string. (Contributed by John Belmonte and David Goodger.) |
Fred Drake | 9f15b5c | 2004-05-18 04:30:00 +0000 | [diff] [blame] | 1184 | |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 1185 | \item The \module{curses} module now supports the ncurses extension |
| 1186 | \function{use_default_colors()}. On platforms where the terminal |
| 1187 | supports transparency, this makes it possible to use a transparent |
| 1188 | background. (Contributed by J\"org Lehmann.) |
| 1189 | |
| 1190 | \item The \module{difflib} module now includes an \class{HtmlDiff} class |
| 1191 | that creates an HTML table showing a side by side comparison |
| 1192 | of two versions of a text. (Contributed by Dan Gass.) |
| 1193 | |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1194 | \item The \module{email} package was updated to version 3.0, |
| 1195 | which dropped various deprecated APIs and removes support for Python |
| 1196 | versions earlier than 2.3. The 3.0 version of the package uses a new |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1197 | incremental parser for MIME messages, available in the |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1198 | \module{email.FeedParser} module. The new parser doesn't require |
| 1199 | reading the entire message into memory, and doesn't throw exceptions |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1200 | if a message is malformed; instead it records any problems in the |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1201 | \member{defect} attribute of the message. (Developed by Anthony |
| 1202 | Baxter, Barry Warsaw, Thomas Wouters, and others.) |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 1203 | |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 1204 | \item The \module{heapq} module has been converted to C. The resulting |
Andrew M. Kuchling | fd0e494 | 2004-02-09 13:23:34 +0000 | [diff] [blame] | 1205 | tenfold improvement in speed makes the module suitable for handling |
Raymond Hettinger | 33ecffb | 2004-06-10 05:03:17 +0000 | [diff] [blame] | 1206 | high volumes of data. In addition, the module has two new functions |
| 1207 | \function{nlargest()} and \function{nsmallest()} that use heaps to |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1208 | find the N largest or smallest values in a dataset without the |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1209 | expense of a full sort. (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | 1a42025 | 2003-11-08 15:58:49 +0000 | [diff] [blame] | 1210 | |
Andrew M. Kuchling | 0c78956 | 2004-09-23 20:15:41 +0000 | [diff] [blame] | 1211 | \item The \module{httplib} module now contains constants for HTTP |
| 1212 | status codes defined in various HTTP-related RFC documents. Constants |
| 1213 | have names such as \constant{OK}, \constant{CREATED}, |
| 1214 | \constant{CONTINUE}, and \constant{MOVED_PERMANENTLY}; use pydoc to |
| 1215 | get a full list. (Contributed by Andrew Eland.) |
| 1216 | |
Andrew M. Kuchling | ce4bae6 | 2004-07-27 12:13:25 +0000 | [diff] [blame] | 1217 | \item The \module{imaplib} module now supports IMAP's THREAD command |
| 1218 | (contributed by Yves Dionne) and new \method{deleteacl()} and |
| 1219 | \method{myrights()} methods (contributed by Arnaud Mazin). |
Andrew M. Kuchling | dff9dbd | 2003-11-20 22:22:19 +0000 | [diff] [blame] | 1220 | |
Andrew M. Kuchling | ad80955 | 2003-12-06 23:19:23 +0000 | [diff] [blame] | 1221 | \item The \module{itertools} module gained a |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1222 | \function{groupby(\var{iterable}\optional{, \var{func}})} function. |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1223 | \var{iterable} is something that can be iterated over to return a |
| 1224 | stream of elements, and the optional \var{func} parameter is a |
| 1225 | function that takes an element and returns a key value; if omitted, |
| 1226 | the key is simply the element itself. \function{groupby()} then |
| 1227 | groups the elements into subsequences which have matching values of |
| 1228 | the key, and returns a series of 2-tuples containing the key value |
| 1229 | and an iterator over the subsequence. |
Andrew M. Kuchling | ad80955 | 2003-12-06 23:19:23 +0000 | [diff] [blame] | 1230 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1231 | Here's an example to make this clearer. The \var{key} function simply |
| 1232 | returns whether a number is even or odd, so the result of |
| 1233 | \function{groupby()} is to return consecutive runs of odd or even |
| 1234 | numbers. |
Andrew M. Kuchling | ad80955 | 2003-12-06 23:19:23 +0000 | [diff] [blame] | 1235 | |
| 1236 | \begin{verbatim} |
| 1237 | >>> import itertools |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1238 | >>> L = [2, 4, 6, 7, 8, 9, 11, 12, 14] |
Andrew M. Kuchling | ad80955 | 2003-12-06 23:19:23 +0000 | [diff] [blame] | 1239 | >>> for key_val, it in itertools.groupby(L, lambda x: x % 2): |
| 1240 | ... print key_val, list(it) |
| 1241 | ... |
| 1242 | 0 [2, 4, 6] |
| 1243 | 1 [7] |
| 1244 | 0 [8] |
| 1245 | 1 [9, 11] |
| 1246 | 0 [12, 14] |
| 1247 | >>> |
| 1248 | \end{verbatim} |
| 1249 | |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1250 | \function{groupby()} is typically used with sorted input. The logic |
| 1251 | for \function{groupby()} is similar to the \UNIX{} \code{uniq} filter |
| 1252 | which makes it handy for eliminating, counting, or identifying |
| 1253 | duplicate elements: |
Raymond Hettinger | feb78c9 | 2003-12-12 13:13:47 +0000 | [diff] [blame] | 1254 | |
| 1255 | \begin{verbatim} |
| 1256 | >>> word = 'abracadabra' |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1257 | >>> letters = sorted(word) # Turn string into a sorted list of letters |
Raymond Hettinger | 64958a1 | 2003-12-17 20:43:33 +0000 | [diff] [blame] | 1258 | >>> letters |
Andrew M. Kuchling | 4612bc5 | 2003-12-16 20:59:37 +0000 | [diff] [blame] | 1259 | ['a', 'a', 'a', 'a', 'a', 'b', 'b', 'c', 'd', 'r', 'r'] |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1260 | >>> for k, g in itertools.groupby(letters): |
| 1261 | ... print k, list(g) |
| 1262 | ... |
| 1263 | a ['a', 'a', 'a', 'a', 'a'] |
| 1264 | b ['b', 'b'] |
| 1265 | c ['c'] |
| 1266 | d ['d'] |
| 1267 | r ['r', 'r'] |
| 1268 | >>> # List unique letters |
| 1269 | >>> [k for k, g in groupby(letters)] |
Raymond Hettinger | feb78c9 | 2003-12-12 13:13:47 +0000 | [diff] [blame] | 1270 | ['a', 'b', 'c', 'd', 'r'] |
Johannes Gijsbers | d345225 | 2004-09-11 16:50:06 +0000 | [diff] [blame] | 1271 | >>> # Count letter occurrences |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1272 | >>> [(k, len(list(g))) for k, g in groupby(letters)] |
Raymond Hettinger | feb78c9 | 2003-12-12 13:13:47 +0000 | [diff] [blame] | 1273 | [('a', 5), ('b', 2), ('c', 1), ('d', 1), ('r', 2)] |
Raymond Hettinger | feb78c9 | 2003-12-12 13:13:47 +0000 | [diff] [blame] | 1274 | \end{verbatim} |
| 1275 | |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1276 | (Contributed by Hye-Shik Chang.) |
| 1277 | |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1278 | \item \module{itertools} also gained a function named |
| 1279 | \function{tee(\var{iterator}, \var{N})} that returns \var{N} independent |
| 1280 | iterators that replicate \var{iterator}. If \var{N} is omitted, the |
| 1281 | default is 2. |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1282 | |
| 1283 | \begin{verbatim} |
| 1284 | >>> L = [1,2,3] |
| 1285 | >>> i1, i2 = itertools.tee(L) |
| 1286 | >>> i1,i2 |
| 1287 | (<itertools.tee object at 0x402c2080>, <itertools.tee object at 0x402c2090>) |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1288 | >>> list(i1) # Run the first iterator to exhaustion |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1289 | [1, 2, 3] |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1290 | >>> list(i2) # Run the second iterator to exhaustion |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1291 | [1, 2, 3] |
| 1292 | >\end{verbatim} |
| 1293 | |
| 1294 | Note that \function{tee()} has to keep copies of the values returned |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1295 | by the iterator; in the worst case, it may need to keep all of them. |
Andrew M. Kuchling | 44a31e1 | 2004-01-01 18:33:34 +0000 | [diff] [blame] | 1296 | This should therefore be used carefully if the leading iterator |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1297 | can run far ahead of the trailing iterator in a long stream of inputs. |
Andrew M. Kuchling | 3bf85f1 | 2004-07-05 01:37:07 +0000 | [diff] [blame] | 1298 | If the separation is large, then you might as well use |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1299 | \function{list()} instead. When the iterators track closely with one |
| 1300 | another, \function{tee()} is ideal. Possible applications include |
| 1301 | bookmarking, windowing, or lookahead iterators. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1302 | (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1303 | |
Andrew M. Kuchling | 5785a13 | 2004-07-26 19:28:46 +0000 | [diff] [blame] | 1304 | \item A number of functions were added to the \module{locale} |
| 1305 | module, such as \function{bind_textdomain_codeset()} to specify a |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1306 | particular encoding and a family of \function{l*gettext()} functions |
Andrew M. Kuchling | 5785a13 | 2004-07-26 19:28:46 +0000 | [diff] [blame] | 1307 | that return messages in the chosen encoding. |
| 1308 | (Contributed by Gustavo Niemeyer.) |
| 1309 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1310 | \item Some keyword arguments were added to the \module{logging} |
| 1311 | package's \function{basicConfig} function to simplify log |
| 1312 | configuration. The default behavior is to log messages to standard |
| 1313 | error, but various keyword arguments can be specified to log to a |
| 1314 | particular file, change the logging format, or set the logging level. |
| 1315 | For example: |
Andrew M. Kuchling | bcefe69 | 2004-07-07 13:01:53 +0000 | [diff] [blame] | 1316 | |
| 1317 | \begin{verbatim} |
| 1318 | import logging |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1319 | logging.basicConfig(filename='/var/log/application.log', |
| 1320 | level=0, # Log all messages |
Andrew M. Kuchling | bcefe69 | 2004-07-07 13:01:53 +0000 | [diff] [blame] | 1321 | format='%(levelname):%(process):%(thread):%(message)') |
| 1322 | \end{verbatim} |
| 1323 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1324 | Other additions to the \module{logging} package include a |
| 1325 | \method{log(\var{level}, \var{msg})} convenience method, as well as a |
| 1326 | \class{TimedRotatingFileHandler} class that rotates its log files at a |
| 1327 | timed interval. The module already had \class{RotatingFileHandler}, |
Andrew M. Kuchling | bcefe69 | 2004-07-07 13:01:53 +0000 | [diff] [blame] | 1328 | which rotated logs once the file exceeded a certain size. Both |
| 1329 | classes derive from a new \class{BaseRotatingHandler} class that can |
| 1330 | be used to implement other rotating handlers. |
| 1331 | |
Andrew M. Kuchling | 579b3e2 | 2004-10-05 20:23:34 +0000 | [diff] [blame] | 1332 | (Changes implemented by Vinay Sajip.) |
| 1333 | |
Andrew M. Kuchling | 0c78956 | 2004-09-23 20:15:41 +0000 | [diff] [blame] | 1334 | \item The \module{marshal} module now shares interned strings on unpacking a |
| 1335 | data structure. This may shrink the size of certain pickle strings, |
| 1336 | but the primary effect is to make \file{.pyc} files significantly smaller. |
| 1337 | (Contributed by Martin von Loewis.) |
| 1338 | |
Andrew M. Kuchling | 5785a13 | 2004-07-26 19:28:46 +0000 | [diff] [blame] | 1339 | \item The \module{nntplib} module's \class{NNTP} class gained |
| 1340 | \method{description()} and \method{descriptions()} methods to retrieve |
| 1341 | newsgroup descriptions for a single group or for a range of groups. |
| 1342 | (Contributed by J\"urgen A. Erhard.) |
| 1343 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1344 | \item Two new functions were added to the \module{operator} module, |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1345 | \function{attrgetter(\var{attr})} and \function{itemgetter(\var{index})}. |
| 1346 | Both functions return callables that take a single argument and return |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1347 | the corresponding attribute or item; these callables make excellent |
Andrew M. Kuchling | bcefe69 | 2004-07-07 13:01:53 +0000 | [diff] [blame] | 1348 | data extractors when used with \function{map()} or |
| 1349 | \function{sorted()}. For example: |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1350 | |
| 1351 | \begin{verbatim} |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1352 | >>> L = [('c', 2), ('d', 1), ('a', 4), ('b', 3)] |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1353 | >>> map(operator.itemgetter(0), L) |
| 1354 | ['c', 'd', 'a', 'b'] |
| 1355 | >>> map(operator.itemgetter(1), L) |
Raymond Hettinger | ed54d91 | 2003-12-31 01:59:18 +0000 | [diff] [blame] | 1356 | [2, 1, 4, 3] |
| 1357 | >>> sorted(L, key=operator.itemgetter(1)) # Sort list by second tuple item |
| 1358 | [('d', 1), ('c', 2), ('b', 3), ('a', 4)] |
Andrew M. Kuchling | 35f2b05 | 2003-12-18 13:28:13 +0000 | [diff] [blame] | 1359 | \end{verbatim} |
| 1360 | |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1361 | (Contributed by Raymond Hettinger.) |
| 1362 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1363 | \item The \module{optparse} module was updated in various ways. The |
| 1364 | module now passes its messages through \function{gettext.gettext()}, |
| 1365 | making it possible to internationalize Optik's help and error |
| 1366 | messages. Help messages for options can now include the string |
| 1367 | \code{'\%default'}, which will be replaced by the option's default |
| 1368 | value. (Contributed by Greg Ward.) |
Andrew M. Kuchling | e30c4d4 | 2004-08-07 13:58:02 +0000 | [diff] [blame] | 1369 | |
Andrew M. Kuchling | f3958f1 | 2004-10-11 19:20:06 +0000 | [diff] [blame] | 1370 | \item The long-term plan is to deprecate the \module{rfc822} module |
| 1371 | in some future Python release in favor of the \module{email} package. |
| 1372 | To this end, the \function{email.Utils.formatdate()} function has been |
| 1373 | changed to make it usable as a replacement for |
| 1374 | \function{rfc822.formatdate()}. You may want to write new e-mail |
| 1375 | processing code with this in mind. (Change implemented by Anthony |
| 1376 | Baxter.) |
| 1377 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1378 | \item A new \function{urandom(\var{n})} function was added to the |
| 1379 | \module{os} module, returning a string containing \var{n} bytes of |
| 1380 | random data. This function provides access to platform-specific |
| 1381 | sources of randomness such as \file{/dev/urandom} on Linux or the |
| 1382 | Windows CryptoAPI. (Contributed by Trevor Perrin.) |
Andrew M. Kuchling | cb7b3f3 | 2004-08-30 11:58:04 +0000 | [diff] [blame] | 1383 | |
| 1384 | \item Another new function: \function{os.path.lexists(\var{path})} |
| 1385 | returns true if the file specified by \var{path} exists, whether or |
| 1386 | not it's a symbolic link. This differs from the existing |
| 1387 | \function{os.path.exists(\var{path})} function, which returns false if |
| 1388 | \var{path} is a symlink that points to a destination that doesn't exist. |
| 1389 | (Contributed by Beni Cherniavsky.) |
| 1390 | |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1391 | \item A new \function{getsid()} function was added to the |
| 1392 | \module{posix} module that underlies the \module{os} module. |
| 1393 | (Contributed by J. Raynor.) |
| 1394 | |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1395 | \item The \module{poplib} module now supports POP over SSL. (Contributed by |
| 1396 | Hector Urtubia.) |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1397 | |
| 1398 | \item The \module{profile} module can now profile C extension functions. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1399 | (Contributed by Nick Bastin.) |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1400 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1401 | \item The \module{random} module has a new method called |
| 1402 | \method{getrandbits(\var{N})} that returns a long integer \var{N} |
| 1403 | bits in length. The existing \method{randrange()} method now uses |
| 1404 | \method{getrandbits()} where appropriate, making generation of |
| 1405 | arbitrarily large random numbers more efficient. (Contributed by |
| 1406 | Raymond Hettinger.) |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1407 | |
| 1408 | \item The regular expression language accepted by the \module{re} module |
| 1409 | was extended with simple conditional expressions, written as |
Andrew M. Kuchling | ab77822 | 2004-08-31 12:07:43 +0000 | [diff] [blame] | 1410 | \regexp{(?(\var{group})\var{A}|\var{B})}. \var{group} is either a |
| 1411 | numeric group ID or a group name defined with \regexp{(?P<group>...)} |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1412 | earlier in the expression. If the specified group matched, the |
| 1413 | regular expression pattern \var{A} will be tested against the string; if |
| 1414 | the group didn't match, the pattern \var{B} will be used instead. |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1415 | (Contributed by Gustavo Niemeyer.) |
Raymond Hettinger | 874ebd5 | 2004-05-31 03:15:02 +0000 | [diff] [blame] | 1416 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1417 | \item The \module{re} module is also no longer recursive, thanks to a |
| 1418 | massive amount of work by Gustavo Niemeyer. In a recursive regular |
| 1419 | expression engine, certain patterns result in a large amount of C |
| 1420 | stack space being consumed, and it was possible to overflow the stack. |
| 1421 | For example, if you matched a 30000-byte string of \samp{a} characters |
| 1422 | against the expression \regexp{(a|b)+}, one stack frame was consumed |
| 1423 | per character. Python 2.3 tried to check for stack overflow and raise |
| 1424 | a \exception{RuntimeError} exception, but certain patterns could |
| 1425 | sidestep the checking and if you were unlucky Python could segfault. |
| 1426 | Python 2.4's regular expression engine can match this pattern without |
| 1427 | problems. |
Andrew M. Kuchling | ab77822 | 2004-08-31 12:07:43 +0000 | [diff] [blame] | 1428 | |
Andrew M. Kuchling | 3805fe7 | 2004-12-01 00:57:12 +0000 | [diff] [blame] | 1429 | \item Two new functions were added to the \module{socket} module. |
| 1430 | \function{socketpair()} returns a pair of connected sockets and |
| 1431 | \function{getservbyport(\var{port})} looks up the service name for a |
| 1432 | given port number. (Contributed by Dave Cole and Barry Warsaw.) |
Andrew M. Kuchling | 7f203b8 | 2004-08-09 14:48:28 +0000 | [diff] [blame] | 1433 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1434 | \item The \function{sys.exitfunc()} function has been deprecated. Code |
| 1435 | should be using the existing \module{atexit} module, which correctly |
| 1436 | handles calling multiple exit functions. Eventually |
| 1437 | \function{sys.exitfunc()} will become a purely internal interface, |
| 1438 | accessed only by \module{atexit}. |
| 1439 | |
| 1440 | \item The \module{tarfile} module now generates GNU-format tar files |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1441 | by default. (Contributed by Lars Gustaebel.) |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1442 | |
Andrew M. Kuchling | 0045717 | 2004-07-15 11:52:40 +0000 | [diff] [blame] | 1443 | \item The \module{threading} module now has an elegantly simple way to support |
| 1444 | thread-local data. The module contains a \class{local} class whose |
| 1445 | attribute values are local to different threads. |
| 1446 | |
| 1447 | \begin{verbatim} |
| 1448 | import threading |
| 1449 | |
| 1450 | data = threading.local() |
| 1451 | data.number = 42 |
| 1452 | data.url = ('www.python.org', 80) |
| 1453 | \end{verbatim} |
| 1454 | |
| 1455 | Other threads can assign and retrieve their own values for the |
| 1456 | \member{number} and \member{url} attributes. You can subclass |
| 1457 | \class{local} to initialize attributes or to add methods. |
| 1458 | (Contributed by Jim Fulton.) |
| 1459 | |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 1460 | \item The \module{timeit} module now automatically disables periodic |
| 1461 | garbarge collection during the timing loop. This change makes |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1462 | consecutive timings more comparable. (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | a331e86 | 2004-09-10 13:05:22 +0000 | [diff] [blame] | 1463 | |
Raymond Hettinger | 874ebd5 | 2004-05-31 03:15:02 +0000 | [diff] [blame] | 1464 | \item The \module{weakref} module now supports a wider variety of objects |
| 1465 | including Python functions, class instances, sets, frozensets, deques, |
| 1466 | arrays, files, sockets, and regular expression pattern objects. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1467 | (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1468 | |
| 1469 | \item The \module{xmlrpclib} module now supports a multi-call extension for |
Andrew M. Kuchling | 0045717 | 2004-07-15 11:52:40 +0000 | [diff] [blame] | 1470 | transmitting multiple XML-RPC calls in a single HTTP operation. |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1471 | (Contributed by Brian Quinlan.) |
Andrew M. Kuchling | 3d3db96 | 2004-08-31 13:57:02 +0000 | [diff] [blame] | 1472 | |
| 1473 | \item The \module{mpz}, \module{rotor}, and \module{xreadlines} modules have |
| 1474 | been removed. |
Andrew M. Kuchling | 69f31eb | 2003-08-13 23:11:04 +0000 | [diff] [blame] | 1475 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1476 | \end{itemize} |
| 1477 | |
| 1478 | |
| 1479 | %====================================================================== |
Raymond Hettinger | ca1a775 | 2004-07-12 13:00:45 +0000 | [diff] [blame] | 1480 | % whole new modules get described in subsections here |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1481 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1482 | %===================== |
Martin v. Löwis | 2a6ba90 | 2004-05-31 18:22:40 +0000 | [diff] [blame] | 1483 | \subsection{cookielib} |
| 1484 | |
| 1485 | The \module{cookielib} library supports client-side handling for HTTP |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1486 | cookies, mirroring the \module{Cookie} module's server-side cookie |
| 1487 | support. Cookies are stored in cookie jars; the library transparently |
| 1488 | stores cookies offered by the web server in the cookie jar, and |
| 1489 | fetches the cookie from the jar when connecting to the server. As in |
| 1490 | web browsers, policy objects control whether cookies are accepted or |
| 1491 | not. |
Martin v. Löwis | 2a6ba90 | 2004-05-31 18:22:40 +0000 | [diff] [blame] | 1492 | |
| 1493 | In order to store cookies across sessions, two implementations of |
| 1494 | cookie jars are provided: one that stores cookies in the Netscape |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1495 | format so applications can use the Mozilla or Lynx cookie files, and |
Martin v. Löwis | 2a6ba90 | 2004-05-31 18:22:40 +0000 | [diff] [blame] | 1496 | one that stores cookies in the same format as the Perl libwww libary. |
| 1497 | |
| 1498 | \module{urllib2} has been changed to interact with \module{cookielib}: |
| 1499 | \class{HTTPCookieProcessor} manages a cookie jar that is used when |
| 1500 | accessing URLs. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1501 | |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1502 | This module was contributed by John J. Lee. |
| 1503 | |
| 1504 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1505 | % ================== |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1506 | \subsection{doctest} |
| 1507 | |
| 1508 | The \module{doctest} module underwent considerable refactoring thanks |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1509 | to Edward Loper and Tim Peters. Testing can still be as simple as |
| 1510 | running \function{doctest.testmod()}, but the refactorings allow |
| 1511 | customizing the module's operation in various ways |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1512 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1513 | The new \class{DocTestFinder} class extracts the tests from a given |
| 1514 | object's docstrings: |
| 1515 | |
| 1516 | \begin{verbatim} |
| 1517 | def f (x, y): |
| 1518 | """>>> f(2,2) |
| 1519 | 4 |
| 1520 | >>> f(3,2) |
| 1521 | 6 |
| 1522 | """ |
| 1523 | return x*y |
| 1524 | |
| 1525 | finder = doctest.DocTestFinder() |
| 1526 | |
| 1527 | # Get list of DocTest instances |
| 1528 | tests = finder.find(f) |
| 1529 | \end{verbatim} |
| 1530 | |
| 1531 | The new \class{DocTestRunner} class then runs individual tests and can |
| 1532 | produce a summary of the results: |
| 1533 | |
| 1534 | \begin{verbatim} |
| 1535 | runner = doctest.DocTestRunner() |
| 1536 | for t in tests: |
| 1537 | tried, failed = runner.run(t) |
| 1538 | |
| 1539 | runner.summarize(verbose=1) |
| 1540 | \end{verbatim} |
| 1541 | |
| 1542 | The above example produces the following output: |
| 1543 | |
| 1544 | \begin{verbatim} |
| 1545 | 1 items passed all tests: |
| 1546 | 2 tests in f |
| 1547 | 2 tests in 1 items. |
| 1548 | 2 passed and 0 failed. |
| 1549 | Test passed. |
| 1550 | \end{verbatim} |
| 1551 | |
| 1552 | \class{DocTestRunner} uses an instance of the \class{OutputChecker} |
| 1553 | class to compare the expected output with the actual output. This |
| 1554 | class takes a number of different flags that customize its behaviour; |
| 1555 | ambitious users can also write a completely new subclass of |
| 1556 | \class{OutputChecker}. |
| 1557 | |
| 1558 | The default output checker provides a number of handy features. |
| 1559 | For example, with the \constant{doctest.ELLIPSIS} option flag, |
| 1560 | an ellipsis (\samp{...}) in the expected output matches any substring, |
| 1561 | making it easier to accommodate outputs that vary in minor ways: |
| 1562 | |
| 1563 | \begin{verbatim} |
| 1564 | def o (n): |
| 1565 | """>>> o(1) |
| 1566 | <__main__.C instance at 0x...> |
| 1567 | >>> |
| 1568 | """ |
| 1569 | \end{verbatim} |
| 1570 | |
| 1571 | Another special string, \samp{<BLANKLINE>}, matches a blank line: |
| 1572 | |
| 1573 | \begin{verbatim} |
| 1574 | def p (n): |
| 1575 | """>>> p(1) |
| 1576 | <BLANKLINE> |
| 1577 | >>> |
| 1578 | """ |
| 1579 | \end{verbatim} |
| 1580 | |
| 1581 | Another new capability is producing a diff-style display of the output |
| 1582 | by specifying the \constant{doctest.REPORT_UDIFF} (unified diffs), |
| 1583 | \constant{doctest.REPORT_CDIFF} (context diffs), or |
| 1584 | \constant{doctest.REPORT_NDIFF} (delta-style) option flags. For example: |
| 1585 | |
| 1586 | \begin{verbatim} |
| 1587 | def g (n): |
| 1588 | """>>> g(4) |
| 1589 | here |
| 1590 | is |
| 1591 | a |
| 1592 | lengthy |
| 1593 | >>>""" |
| 1594 | L = 'here is a rather lengthy list of words'.split() |
| 1595 | for word in L[:n]: |
| 1596 | print word |
| 1597 | \end{verbatim} |
| 1598 | |
| 1599 | Running the above function's tests with |
| 1600 | \constant{doctest.REPORT_UDIFF} specified, you get the following output: |
| 1601 | |
| 1602 | \begin{verbatim} |
| 1603 | ********************************************************************** |
| 1604 | File ``t.py'', line 15, in g |
| 1605 | Failed example: |
| 1606 | g(4) |
| 1607 | Differences (unified diff with -expected +actual): |
| 1608 | @@ -2,3 +2,3 @@ |
| 1609 | is |
| 1610 | a |
| 1611 | -lengthy |
| 1612 | +rather |
| 1613 | ********************************************************************** |
| 1614 | \end{verbatim} |
| 1615 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1616 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1617 | % ====================================================================== |
| 1618 | \section{Build and C API Changes} |
| 1619 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1620 | Some of the changes to Python's build process and to the C API are: |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1621 | |
| 1622 | \begin{itemize} |
| 1623 | |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1624 | \item Three new convenience macros were added for common return |
| 1625 | values from extension functions: \csimplemacro{Py_RETURN_NONE}, |
| 1626 | \csimplemacro{Py_RETURN_TRUE}, and \csimplemacro{Py_RETURN_FALSE}. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1627 | (Contributed by Brett Cannon.) |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1628 | |
Andrew M. Kuchling | 5785a13 | 2004-07-26 19:28:46 +0000 | [diff] [blame] | 1629 | \item Another new macro, \csimplemacro{Py_CLEAR(\var{obj})}, |
| 1630 | decreases the reference count of \var{obj} and sets \var{obj} to the |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1631 | null pointer. (Contributed by Jim Fulton.) |
Andrew M. Kuchling | 5785a13 | 2004-07-26 19:28:46 +0000 | [diff] [blame] | 1632 | |
Fred Drake | ce3caf2 | 2004-02-12 18:13:12 +0000 | [diff] [blame] | 1633 | \item A new function, \cfunction{PyTuple_Pack(\var{N}, \var{obj1}, |
| 1634 | \var{obj2}, ..., \var{objN})}, constructs tuples from a variable |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1635 | length argument list of Python objects. (Contributed by Raymond Hettinger.) |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1636 | |
Fred Drake | ce3caf2 | 2004-02-12 18:13:12 +0000 | [diff] [blame] | 1637 | \item A new function, \cfunction{PyDict_Contains(\var{d}, \var{k})}, |
| 1638 | implements fast dictionary lookups without masking exceptions raised |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1639 | during the look-up process. (Contributed by Raymond Hettinger.) |
Raymond Hettinger | d446230 | 2003-11-26 17:52:45 +0000 | [diff] [blame] | 1640 | |
Andrew M. Kuchling | 0c78956 | 2004-09-23 20:15:41 +0000 | [diff] [blame] | 1641 | \item The \csimplemacro{Py_IS_NAN(\var{X})} macro returns 1 if |
| 1642 | its float or double argument \var{X} is a NaN. |
| 1643 | (Contributed by Tim Peters.) |
| 1644 | |
Andrew M. Kuchling | f3958f1 | 2004-10-11 19:20:06 +0000 | [diff] [blame] | 1645 | \item C code can avoid unnecessary locking by using the new |
| 1646 | \cfunction{PyEval_ThreadsInitialized()} function to tell |
| 1647 | if any thread operations have been performed. If this function |
| 1648 | returns false, no lock operations are needed. |
| 1649 | (Contributed by Nick Coghlan.) |
| 1650 | |
Andrew M. Kuchling | e30c4d4 | 2004-08-07 13:58:02 +0000 | [diff] [blame] | 1651 | \item A new function, \cfunction{PyArg_VaParseTupleAndKeywords()}, |
| 1652 | is the same as \cfunction{PyArg_ParseTupleAndKeywords()} but takes a |
| 1653 | \ctype{va_list} instead of a number of arguments. |
| 1654 | (Contributed by Greg Chapman.) |
| 1655 | |
Fred Drake | ce3caf2 | 2004-02-12 18:13:12 +0000 | [diff] [blame] | 1656 | \item A new method flag, \constant{METH_COEXISTS}, allows a function |
Andrew M. Kuchling | 71432f1 | 2004-07-05 01:40:07 +0000 | [diff] [blame] | 1657 | defined in slots to co-exist with a \ctype{PyCFunction} having the |
| 1658 | same name. This can halve the access time for a method such as |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1659 | \method{set.__contains__()}. (Contributed by Raymond Hettinger.) |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1660 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1661 | \item Python can now be built with additional profiling for the |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1662 | interpreter itself, intended as an aid to people developing the |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1663 | Python core. Providing \longprogramopt{--enable-profiling} to the |
| 1664 | \program{configure} script will let you profile the interpreter with |
| 1665 | \program{gprof}, and providing the \longprogramopt{--with-tsc} |
| 1666 | switch enables profiling using the Pentium's Time-Stamp-Counter |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1667 | register. Note that the \longprogramopt{--with-tsc} switch is slightly |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1668 | misnamed, because the profiling feature also works on the PowerPC |
| 1669 | platform, though that processor architecture doesn't call that |
Andrew M. Kuchling | 067947e | 2004-11-19 14:43:36 +0000 | [diff] [blame] | 1670 | register ``the TSC register''. (Contributed by Jeremy Hylton.) |
| 1671 | |
Andrew M. Kuchling | d0b6d9d | 2004-07-04 15:35:00 +0000 | [diff] [blame] | 1672 | \item The \ctype{tracebackobject} type has been renamed to \ctype{PyTracebackObject}. |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1673 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1674 | \end{itemize} |
| 1675 | |
| 1676 | |
| 1677 | %====================================================================== |
| 1678 | \subsection{Port-Specific Changes} |
| 1679 | |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1680 | \begin{itemize} |
| 1681 | |
| 1682 | \item The Windows port now builds under MSVC++ 7.1 as well as version 6. |
Andrew M. Kuchling | 7642f7a | 2004-09-13 15:06:50 +0000 | [diff] [blame] | 1683 | (Contributed by Martin von Loewis.) |
Raymond Hettinger | 97ef8de | 2004-01-05 00:29:57 +0000 | [diff] [blame] | 1684 | |
| 1685 | \end{itemize} |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1686 | |
| 1687 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1688 | |
| 1689 | %====================================================================== |
| 1690 | \section{Porting to Python 2.4} |
| 1691 | |
| 1692 | This section lists previously described changes that may require |
| 1693 | changes to your code: |
| 1694 | |
| 1695 | \begin{itemize} |
| 1696 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1697 | \item Left shifts and hexadecimal/octal constants that are too |
| 1698 | large no longer trigger a \exception{FutureWarning} and return |
| 1699 | a value limited to 32 or 64 bits; instead they return a long integer. |
| 1700 | |
| 1701 | \item Integer operations will no longer trigger an \exception{OverflowWarning}. |
| 1702 | The \exception{OverflowWarning} warning will disappear in Python 2.5. |
| 1703 | |
Raymond Hettinger | 607c00f | 2003-11-12 16:27:50 +0000 | [diff] [blame] | 1704 | \item The \function{zip()} built-in function and \function{itertools.izip()} |
| 1705 | now return an empty list instead of raising a \exception{TypeError} |
| 1706 | exception if called with no arguments. |
Andrew M. Kuchling | 6aedcfc | 2003-10-21 12:48:23 +0000 | [diff] [blame] | 1707 | |
| 1708 | \item \function{dircache.listdir()} now passes exceptions to the caller |
| 1709 | instead of returning empty lists. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1710 | |
Andrew M. Kuchling | 71432f1 | 2004-07-05 01:40:07 +0000 | [diff] [blame] | 1711 | \item \function{LexicalHandler.startDTD()} used to receive the public and |
| 1712 | system IDs in the wrong order. This has been corrected; applications |
Fred Drake | 56fcc23 | 2004-05-06 02:55:35 +0000 | [diff] [blame] | 1713 | relying on the wrong order need to be fixed. |
Martin v. Löwis | 456ab1d | 2004-05-06 01:54:36 +0000 | [diff] [blame] | 1714 | |
Andrew M. Kuchling | 71432f1 | 2004-07-05 01:40:07 +0000 | [diff] [blame] | 1715 | \item \function{fcntl.ioctl} now warns if the \var{mutate} |
| 1716 | argument is omitted and relevant. |
Martin v. Löwis | 77ca6c4 | 2004-06-03 12:47:26 +0000 | [diff] [blame] | 1717 | |
Andrew M. Kuchling | 87c98b2 | 2004-08-25 13:38:46 +0000 | [diff] [blame] | 1718 | \item The \module{tarfile} module now generates GNU-format tar files |
| 1719 | by default. |
| 1720 | |
Andrew M. Kuchling | f8c075c | 2004-11-09 02:58:02 +0000 | [diff] [blame] | 1721 | \item Encountering a failure while importing a module no longer leaves |
| 1722 | a partially-initialized module object in \code{sys.modules}. |
| 1723 | |
| 1724 | \item \constant{None} is now a constant; code that binds a new value to |
| 1725 | the name \samp{None} is now a syntax error. |
| 1726 | |
Anthony Baxter | 57ee770 | 2004-12-13 11:39:33 +0000 | [diff] [blame] | 1727 | % signal module now raises a RuntimeError on insane calls - e.g. setting a |
| 1728 | % handler on SIGKILL |
| 1729 | |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1730 | \end{itemize} |
| 1731 | |
| 1732 | |
| 1733 | %====================================================================== |
| 1734 | \section{Acknowledgements \label{acks}} |
| 1735 | |
| 1736 | The author would like to thank the following people for offering |
| 1737 | suggestions, corrections and assistance with various drafts of this |
Andrew M. Kuchling | 536183b | 2004-11-25 01:15:25 +0000 | [diff] [blame] | 1738 | article: Koray Can, Hye-Shik Chang, Michael Dyck, Raymond Hettinger, |
Andrew M. Kuchling | b69c49c | 2004-12-01 00:42:41 +0000 | [diff] [blame] | 1739 | Brian Hurt, Hamish Lawson, Fredrik Lundh, Sean Reifschneider. |
Fred Drake | ed0fa3d | 2003-07-30 19:14:09 +0000 | [diff] [blame] | 1740 | |
| 1741 | \end{document} |