You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

440 lines
16 KiB

14 years ago
15 years ago
15 years ago
Merged revisions 74074,74077,74111,74188,74192-74193,74200,74252-74253,74258-74261 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74074 | georg.brandl | 2009-07-18 05:03:10 -0400 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ........ r74077 | georg.brandl | 2009-07-18 05:43:40 -0400 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ........ r74111 | benjamin.peterson | 2009-07-20 09:30:10 -0400 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ........ r74188 | benjamin.peterson | 2009-07-23 10:25:31 -0400 (Thu, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 12:28:38 -0400 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 12:46:38 -0400 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74200 | georg.brandl | 2009-07-25 09:02:15 -0400 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ........ r74252 | georg.brandl | 2009-07-29 12:06:31 -0400 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ........ r74253 | georg.brandl | 2009-07-29 12:09:17 -0400 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ........ r74258 | georg.brandl | 2009-07-29 12:57:05 -0400 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ........ r74259 | georg.brandl | 2009-07-29 13:07:21 -0400 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ........ r74260 | georg.brandl | 2009-07-29 13:15:20 -0400 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ........ r74261 | georg.brandl | 2009-07-29 13:50:25 -0400 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ........
17 years ago
Merged revisions 74074,74077,74111,74188,74192-74193,74200,74252-74253,74258-74261 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74074 | georg.brandl | 2009-07-18 05:03:10 -0400 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ........ r74077 | georg.brandl | 2009-07-18 05:43:40 -0400 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ........ r74111 | benjamin.peterson | 2009-07-20 09:30:10 -0400 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ........ r74188 | benjamin.peterson | 2009-07-23 10:25:31 -0400 (Thu, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 12:28:38 -0400 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 12:46:38 -0400 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74200 | georg.brandl | 2009-07-25 09:02:15 -0400 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ........ r74252 | georg.brandl | 2009-07-29 12:06:31 -0400 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ........ r74253 | georg.brandl | 2009-07-29 12:09:17 -0400 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ........ r74258 | georg.brandl | 2009-07-29 12:57:05 -0400 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ........ r74259 | georg.brandl | 2009-07-29 13:07:21 -0400 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ........ r74260 | georg.brandl | 2009-07-29 13:15:20 -0400 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ........ r74261 | georg.brandl | 2009-07-29 13:50:25 -0400 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ........
17 years ago
Merged revisions 74074,74077,74111,74188,74192-74193,74200,74252-74253,74258-74261 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74074 | georg.brandl | 2009-07-18 05:03:10 -0400 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ........ r74077 | georg.brandl | 2009-07-18 05:43:40 -0400 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ........ r74111 | benjamin.peterson | 2009-07-20 09:30:10 -0400 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ........ r74188 | benjamin.peterson | 2009-07-23 10:25:31 -0400 (Thu, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 12:28:38 -0400 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 12:46:38 -0400 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74200 | georg.brandl | 2009-07-25 09:02:15 -0400 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ........ r74252 | georg.brandl | 2009-07-29 12:06:31 -0400 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ........ r74253 | georg.brandl | 2009-07-29 12:09:17 -0400 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ........ r74258 | georg.brandl | 2009-07-29 12:57:05 -0400 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ........ r74259 | georg.brandl | 2009-07-29 13:07:21 -0400 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ........ r74260 | georg.brandl | 2009-07-29 13:15:20 -0400 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ........ r74261 | georg.brandl | 2009-07-29 13:50:25 -0400 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ........
17 years ago
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
18 years ago
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines Apply patch for issue 3090: ARCHFLAGS parsing incorrect ........ r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines #3045: fix pydoc behavior for TEMP path with spaces. ........ r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines #1608818: errno can get set by every call to readdir(). ........ r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines #3305: self->stream can be NULL. ........ r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines #3345: fix docstring. ........ r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines #3312: fix two sqlite3 crashes. ........ r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines #3388: add a paragraph about using "with" for file objects. ........ r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines news note for r63052 ........ r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines Fix issue 3395, update _debugInfo to be _debug_info ........ r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines Last bit of a fix for issue3381 (addon for my patch in r65061) ........ r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch. ........ r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines Remove duplicate entry in __all__. ........ r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines Correct attribute name. ........ r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines Document the different meaning of precision for {:f} and {:g}. Also document how inf and nan are formatted. #3404. ........ r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line Improve accuracy of gamma test function ........ r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line Add recipe to the itertools docs. ........ r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines #3378: in case of no memory, don't leak even more memory. :) ........ r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines #3302: fix segfaults when passing None for arguments that can't be NULL for the C functions. ........ r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines #3303: fix crash with invalid Py_DECREF in strcoll(). ........ r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines #3319: don't raise ZeroDivisionError if number of rounds is so low that benchtime is zero. ........ r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines #3323: mention that if inheriting from a class without __slots__, the subclass will have a __dict__ available too. ........ r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines Add ordering info for findall and finditer. ........ r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line Fix compress() recipe in docs to use itertools. ........ r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line Clean-up itertools docs and recipes. ........ r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines fix issue3120 - don't truncate handles on 64-bit Windows. This is still messy, realistically PC/_subprocess.c should never cast pointers to python numbers and back at all. I don't have a 64-bit windows build environment because microsoft apparently thinks that should cost money. Time to watch the buildbots. It builds and passes tests on 32-bit windows. ........ r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines #926501: add info where to put the docstring. ........ r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line Fix a couple of names in error messages that were wrong ........ r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line Fix misspeeld method name (negative) ........ r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines Increment version number in NEWS file, and move items that were added after 2.6b2. (I thought there was a script to automate this kind of updates) ........ r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines Issue2378: pdb would delete free variables when stepping into a class statement. The problem was introduced by r53954, the correction is to restore the symmetry between PyFrame_FastToLocals and PyFrame_LocalsToFast ........ r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line don't use assert statement ........ r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines Fix buglet in fix for issue3381 ........ r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines Fix build issue on OSX 10.4, somehow this wasn't committed before. ........ r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line Remove out-of-date section on Exact/Inexact. ........ r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line Tuples now have both count() and index(). ........ r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line Fix credits for math.sum() ........ r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line One more attribution. ........ r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line remove unneeded import ........ r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line use isinstance ........
18 years ago
Merged revisions 74074,74077,74111,74188,74192-74193,74200,74252-74253,74258-74261 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74074 | georg.brandl | 2009-07-18 05:03:10 -0400 (Sat, 18 Jul 2009) | 1 line #6513: fix example code: warning categories are classes, not instances. ........ r74077 | georg.brandl | 2009-07-18 05:43:40 -0400 (Sat, 18 Jul 2009) | 1 line #6489: fix an ambiguity in getiterator() documentation. ........ r74111 | benjamin.peterson | 2009-07-20 09:30:10 -0400 (Mon, 20 Jul 2009) | 1 line remove docs for deprecated -p option ........ r74188 | benjamin.peterson | 2009-07-23 10:25:31 -0400 (Thu, 23 Jul 2009) | 1 line use bools ........ r74192 | georg.brandl | 2009-07-24 12:28:38 -0400 (Fri, 24 Jul 2009) | 1 line Fix arg types of et#. ........ r74193 | georg.brandl | 2009-07-24 12:46:38 -0400 (Fri, 24 Jul 2009) | 1 line Dont put "void" in signature for nullary functions. ........ r74200 | georg.brandl | 2009-07-25 09:02:15 -0400 (Sat, 25 Jul 2009) | 1 line #6571: add index entries for more operators. ........ r74252 | georg.brandl | 2009-07-29 12:06:31 -0400 (Wed, 29 Jul 2009) | 1 line #6593: fix link targets. ........ r74253 | georg.brandl | 2009-07-29 12:09:17 -0400 (Wed, 29 Jul 2009) | 1 line #6591: add reference to ioctl in fcntl module for platforms other than Windows. ........ r74258 | georg.brandl | 2009-07-29 12:57:05 -0400 (Wed, 29 Jul 2009) | 1 line Add a link to readline, and mention IPython and bpython. ........ r74259 | georg.brandl | 2009-07-29 13:07:21 -0400 (Wed, 29 Jul 2009) | 1 line Fix some markup and small factual glitches found by M. Markert. ........ r74260 | georg.brandl | 2009-07-29 13:15:20 -0400 (Wed, 29 Jul 2009) | 1 line Fix a few markup glitches. ........ r74261 | georg.brandl | 2009-07-29 13:50:25 -0400 (Wed, 29 Jul 2009) | 1 line Rewrite the section about classes a bit; mostly tidbits, and a larger update to the section about "private" variables to reflect the Pythonic consensus better. ........
17 years ago
  1. .. _tut-io:
  2. ****************
  3. Input and Output
  4. ****************
  5. There are several ways to present the output of a program; data can be printed
  6. in a human-readable form, or written to a file for future use. This chapter will
  7. discuss some of the possibilities.
  8. .. _tut-formatting:
  9. Fancier Output Formatting
  10. =========================
  11. So far we've encountered two ways of writing values: *expression statements* and
  12. the :func:`print` function. (A third way is using the :meth:`write` method
  13. of file objects; the standard output file can be referenced as ``sys.stdout``.
  14. See the Library Reference for more information on this.)
  15. Often you'll want more control over the formatting of your output than simply
  16. printing space-separated values. There are two ways to format your output; the
  17. first way is to do all the string handling yourself; using string slicing and
  18. concatenation operations you can create any layout you can imagine. The
  19. string type has some methods that perform useful operations for padding
  20. strings to a given column width; these will be discussed shortly. The second
  21. way is to use the :meth:`str.format` method.
  22. The :mod:`string` module contains a :class:`~string.Template` class which offers
  23. yet another way to substitute values into strings.
  24. One question remains, of course: how do you convert values to strings? Luckily,
  25. Python has ways to convert any value to a string: pass it to the :func:`repr`
  26. or :func:`str` functions.
  27. The :func:`str` function is meant to return representations of values which are
  28. fairly human-readable, while :func:`repr` is meant to generate representations
  29. which can be read by the interpreter (or will force a :exc:`SyntaxError` if
  30. there is no equivalent syntax). For objects which don't have a particular
  31. representation for human consumption, :func:`str` will return the same value as
  32. :func:`repr`. Many values, such as numbers or structures like lists and
  33. dictionaries, have the same representation using either function. Strings, in
  34. particular, have two distinct representations.
  35. Some examples::
  36. >>> s = 'Hello, world.'
  37. >>> str(s)
  38. 'Hello, world.'
  39. >>> repr(s)
  40. "'Hello, world.'"
  41. >>> str(1/7)
  42. '0.14285714285714285'
  43. >>> x = 10 * 3.25
  44. >>> y = 200 * 200
  45. >>> s = 'The value of x is ' + repr(x) + ', and y is ' + repr(y) + '...'
  46. >>> print(s)
  47. The value of x is 32.5, and y is 40000...
  48. >>> # The repr() of a string adds string quotes and backslashes:
  49. ... hello = 'hello, world\n'
  50. >>> hellos = repr(hello)
  51. >>> print(hellos)
  52. 'hello, world\n'
  53. >>> # The argument to repr() may be any Python object:
  54. ... repr((x, y, ('spam', 'eggs')))
  55. "(32.5, 40000, ('spam', 'eggs'))"
  56. Here are two ways to write a table of squares and cubes::
  57. >>> for x in range(1, 11):
  58. ... print(repr(x).rjust(2), repr(x*x).rjust(3), end=' ')
  59. ... # Note use of 'end' on previous line
  60. ... print(repr(x*x*x).rjust(4))
  61. ...
  62. 1 1 1
  63. 2 4 8
  64. 3 9 27
  65. 4 16 64
  66. 5 25 125
  67. 6 36 216
  68. 7 49 343
  69. 8 64 512
  70. 9 81 729
  71. 10 100 1000
  72. >>> for x in range(1, 11):
  73. ... print('{0:2d} {1:3d} {2:4d}'.format(x, x*x, x*x*x))
  74. ...
  75. 1 1 1
  76. 2 4 8
  77. 3 9 27
  78. 4 16 64
  79. 5 25 125
  80. 6 36 216
  81. 7 49 343
  82. 8 64 512
  83. 9 81 729
  84. 10 100 1000
  85. (Note that in the first example, one space between each column was added by the
  86. way :func:`print` works: it always adds spaces between its arguments.)
  87. This example demonstrates the :meth:`str.rjust` method of string
  88. objects, which right-justifies a string in a field of a given width by padding
  89. it with spaces on the left. There are similar methods :meth:`str.ljust` and
  90. :meth:`str.center`. These methods do not write anything, they just return a
  91. new string. If the input string is too long, they don't truncate it, but
  92. return it unchanged; this will mess up your column lay-out but that's usually
  93. better than the alternative, which would be lying about a value. (If you
  94. really want truncation you can always add a slice operation, as in
  95. ``x.ljust(n)[:n]``.)
  96. There is another method, :meth:`str.zfill`, which pads a numeric string on the
  97. left with zeros. It understands about plus and minus signs::
  98. >>> '12'.zfill(5)
  99. '00012'
  100. >>> '-3.14'.zfill(7)
  101. '-003.14'
  102. >>> '3.14159265359'.zfill(5)
  103. '3.14159265359'
  104. Basic usage of the :meth:`str.format` method looks like this::
  105. >>> print('We are the {} who say "{}!"'.format('knights', 'Ni'))
  106. We are the knights who say "Ni!"
  107. The brackets and characters within them (called format fields) are replaced with
  108. the objects passed into the :meth:`str.format` method. A number in the
  109. brackets can be used to refer to the position of the object passed into the
  110. :meth:`str.format` method. ::
  111. >>> print('{0} and {1}'.format('spam', 'eggs'))
  112. spam and eggs
  113. >>> print('{1} and {0}'.format('spam', 'eggs'))
  114. eggs and spam
  115. If keyword arguments are used in the :meth:`str.format` method, their values
  116. are referred to by using the name of the argument. ::
  117. >>> print('This {food} is {adjective}.'.format(
  118. ... food='spam', adjective='absolutely horrible'))
  119. This spam is absolutely horrible.
  120. Positional and keyword arguments can be arbitrarily combined::
  121. >>> print('The story of {0}, {1}, and {other}.'.format('Bill', 'Manfred',
  122. other='Georg'))
  123. The story of Bill, Manfred, and Georg.
  124. ``'!a'`` (apply :func:`ascii`), ``'!s'`` (apply :func:`str`) and ``'!r'``
  125. (apply :func:`repr`) can be used to convert the value before it is formatted::
  126. >>> import math
  127. >>> print('The value of PI is approximately {}.'.format(math.pi))
  128. The value of PI is approximately 3.14159265359.
  129. >>> print('The value of PI is approximately {!r}.'.format(math.pi))
  130. The value of PI is approximately 3.141592653589793.
  131. An optional ``':'`` and format specifier can follow the field name. This allows
  132. greater control over how the value is formatted. The following example
  133. rounds Pi to three places after the decimal.
  134. >>> import math
  135. >>> print('The value of PI is approximately {0:.3f}.'.format(math.pi))
  136. The value of PI is approximately 3.142.
  137. Passing an integer after the ``':'`` will cause that field to be a minimum
  138. number of characters wide. This is useful for making tables pretty. ::
  139. >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 7678}
  140. >>> for name, phone in table.items():
  141. ... print('{0:10} ==> {1:10d}'.format(name, phone))
  142. ...
  143. Jack ==> 4098
  144. Dcab ==> 7678
  145. Sjoerd ==> 4127
  146. If you have a really long format string that you don't want to split up, it
  147. would be nice if you could reference the variables to be formatted by name
  148. instead of by position. This can be done by simply passing the dict and using
  149. square brackets ``'[]'`` to access the keys ::
  150. >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678}
  151. >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; '
  152. ... 'Dcab: {0[Dcab]:d}'.format(table))
  153. Jack: 4098; Sjoerd: 4127; Dcab: 8637678
  154. This could also be done by passing the table as keyword arguments with the '**'
  155. notation. ::
  156. >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678}
  157. >>> print('Jack: {Jack:d}; Sjoerd: {Sjoerd:d}; Dcab: {Dcab:d}'.format(**table))
  158. Jack: 4098; Sjoerd: 4127; Dcab: 8637678
  159. This is particularly useful in combination with the built-in function
  160. :func:`vars`, which returns a dictionary containing all local variables.
  161. For a complete overview of string formatting with :meth:`str.format`, see
  162. :ref:`formatstrings`.
  163. Old string formatting
  164. ---------------------
  165. The ``%`` operator can also be used for string formatting. It interprets the
  166. left argument much like a :c:func:`sprintf`\ -style format string to be applied
  167. to the right argument, and returns the string resulting from this formatting
  168. operation. For example::
  169. >>> import math
  170. >>> print('The value of PI is approximately %5.3f.' % math.pi)
  171. The value of PI is approximately 3.142.
  172. More information can be found in the :ref:`old-string-formatting` section.
  173. .. _tut-files:
  174. Reading and Writing Files
  175. =========================
  176. .. index::
  177. builtin: open
  178. object: file
  179. :func:`open` returns a :term:`file object`, and is most commonly used with
  180. two arguments: ``open(filename, mode)``.
  181. ::
  182. >>> f = open('workfile', 'w')
  183. .. XXX str(f) is <io.TextIOWrapper object at 0x82e8dc4>
  184. >>> print(f)
  185. <open file 'workfile', mode 'w' at 80a0960>
  186. The first argument is a string containing the filename. The second argument is
  187. another string containing a few characters describing the way in which the file
  188. will be used. *mode* can be ``'r'`` when the file will only be read, ``'w'``
  189. for only writing (an existing file with the same name will be erased), and
  190. ``'a'`` opens the file for appending; any data written to the file is
  191. automatically added to the end. ``'r+'`` opens the file for both reading and
  192. writing. The *mode* argument is optional; ``'r'`` will be assumed if it's
  193. omitted.
  194. Normally, files are opened in :dfn:`text mode`, that means, you read and write
  195. strings from and to the file, which are encoded in a specific encoding (the
  196. default being UTF-8). ``'b'`` appended to the mode opens the file in
  197. :dfn:`binary mode`: now the data is read and written in the form of bytes
  198. objects. This mode should be used for all files that don't contain text.
  199. In text mode, the default when reading is to convert platform-specific line
  200. endings (``\n`` on Unix, ``\r\n`` on Windows) to just ``\n``. When writing in
  201. text mode, the default is to convert occurrences of ``\n`` back to
  202. platform-specific line endings. This behind-the-scenes modification
  203. to file data is fine for text files, but will corrupt binary data like that in
  204. :file:`JPEG` or :file:`EXE` files. Be very careful to use binary mode when
  205. reading and writing such files.
  206. .. _tut-filemethods:
  207. Methods of File Objects
  208. -----------------------
  209. The rest of the examples in this section will assume that a file object called
  210. ``f`` has already been created.
  211. To read a file's contents, call ``f.read(size)``, which reads some quantity of
  212. data and returns it as a string or bytes object. *size* is an optional numeric
  213. argument. When *size* is omitted or negative, the entire contents of the file
  214. will be read and returned; it's your problem if the file is twice as large as
  215. your machine's memory. Otherwise, at most *size* bytes are read and returned.
  216. If the end of the file has been reached, ``f.read()`` will return an empty
  217. string (``''``). ::
  218. >>> f.read()
  219. 'This is the entire file.\n'
  220. >>> f.read()
  221. ''
  222. ``f.readline()`` reads a single line from the file; a newline character (``\n``)
  223. is left at the end of the string, and is only omitted on the last line of the
  224. file if the file doesn't end in a newline. This makes the return value
  225. unambiguous; if ``f.readline()`` returns an empty string, the end of the file
  226. has been reached, while a blank line is represented by ``'\n'``, a string
  227. containing only a single newline. ::
  228. >>> f.readline()
  229. 'This is the first line of the file.\n'
  230. >>> f.readline()
  231. 'Second line of the file\n'
  232. >>> f.readline()
  233. ''
  234. For reading lines from a file, you can loop over the file object. This is memory
  235. efficient, fast, and leads to simple code::
  236. >>> for line in f:
  237. ... print(line, end='')
  238. ...
  239. This is the first line of the file.
  240. Second line of the file
  241. If you want to read all the lines of a file in a list you can also use
  242. ``list(f)`` or ``f.readlines()``.
  243. ``f.write(string)`` writes the contents of *string* to the file, returning
  244. the number of characters written. ::
  245. >>> f.write('This is a test\n')
  246. 15
  247. To write something other than a string, it needs to be converted to a string
  248. first::
  249. >>> value = ('the answer', 42)
  250. >>> s = str(value)
  251. >>> f.write(s)
  252. 18
  253. ``f.tell()`` returns an integer giving the file object's current position in the file
  254. represented as number of bytes from the beginning of the file when in `binary mode` and
  255. an opaque number when in `text mode`.
  256. To change the file object's position, use ``f.seek(offset, from_what)``. The position is computed
  257. from adding *offset* to a reference point; the reference point is selected by
  258. the *from_what* argument. A *from_what* value of 0 measures from the beginning
  259. of the file, 1 uses the current file position, and 2 uses the end of the file as
  260. the reference point. *from_what* can be omitted and defaults to 0, using the
  261. beginning of the file as the reference point. ::
  262. >>> f = open('workfile', 'rb+')
  263. >>> f.write(b'0123456789abcdef')
  264. 16
  265. >>> f.seek(5) # Go to the 6th byte in the file
  266. 5
  267. >>> f.read(1)
  268. b'5'
  269. >>> f.seek(-3, 2) # Go to the 3rd byte before the end
  270. 13
  271. >>> f.read(1)
  272. b'd'
  273. In text files (those opened without a ``b`` in the mode string), only seeks
  274. relative to the beginning of the file are allowed (the exception being seeking
  275. to the very file end with ``seek(0, 2)``) and the only valid *offset* values are
  276. those returned from the ``f.tell()``, or zero. Any other *offset* value produces
  277. undefined behaviour.
  278. When you're done with a file, call ``f.close()`` to close it and free up any
  279. system resources taken up by the open file. After calling ``f.close()``,
  280. attempts to use the file object will automatically fail. ::
  281. >>> f.close()
  282. >>> f.read()
  283. Traceback (most recent call last):
  284. File "<stdin>", line 1, in ?
  285. ValueError: I/O operation on closed file
  286. It is good practice to use the :keyword:`with` keyword when dealing with file
  287. objects. This has the advantage that the file is properly closed after its
  288. suite finishes, even if an exception is raised on the way. It is also much
  289. shorter than writing equivalent :keyword:`try`\ -\ :keyword:`finally` blocks::
  290. >>> with open('workfile', 'r') as f:
  291. ... read_data = f.read()
  292. >>> f.closed
  293. True
  294. File objects have some additional methods, such as :meth:`~file.isatty` and
  295. :meth:`~file.truncate` which are less frequently used; consult the Library
  296. Reference for a complete guide to file objects.
  297. .. _tut-json:
  298. Saving structured data with :mod:`json`
  299. ---------------------------------------
  300. .. index:: module: json
  301. Strings can easily be written to and read from a file. Numbers take a bit more
  302. effort, since the :meth:`read` method only returns strings, which will have to
  303. be passed to a function like :func:`int`, which takes a string like ``'123'``
  304. and returns its numeric value 123. When you want to save more complex data
  305. types like nested lists and dictionaries, parsing and serializing by hand
  306. becomes complicated.
  307. Rather than having users constantly writing and debugging code to save
  308. complicated data types to files, Python allows you to use the popular data
  309. interchange format called `JSON (JavaScript Object Notation)
  310. <http://json.org>`_. The standard module called :mod:`json` can take Python
  311. data hierarchies, and convert them to string representations; this process is
  312. called :dfn:`serializing`. Reconstructing the data from the string representation
  313. is called :dfn:`deserializing`. Between serializing and deserializing, the
  314. string representing the object may have been stored in a file or data, or
  315. sent over a network connection to some distant machine.
  316. .. note::
  317. The JSON format is commonly used by modern applications to allow for data
  318. exchange. Many programmers are already familiar with it, which makes
  319. it a good choice for interoperability.
  320. If you have an object ``x``, you can view its JSON string representation with a
  321. simple line of code::
  322. >>> json.dumps([1, 'simple', 'list'])
  323. '[1, "simple", "list"]'
  324. Another variant of the :func:`~json.dumps` function, called :func:`~json.dump`,
  325. simply serializes the object to a :term:`text file`. So if ``f`` is a
  326. :term:`text file` object opened for writing, we can do this::
  327. json.dump(x, f)
  328. To decode the object again, if ``f`` is a :term:`text file` object which has
  329. been opened for reading::
  330. x = json.load(f)
  331. This simple serialization technique can handle lists and dictionaries, but
  332. serializing arbitrary class instances in JSON requires a bit of extra effort.
  333. The reference for the :mod:`json` module contains an explanation of this.
  334. .. seealso::
  335. :mod:`pickle` - the pickle module
  336. Contrary to :ref:`JSON <tut-json>`, *pickle* is a protocol which allows
  337. the serialization of arbitrarily complex Python objects. As such, it is
  338. specific to Python and cannot be used to communicate with applications
  339. written in other languages. It is also insecure by default:
  340. deserializing pickle data coming from an untrusted source can execute
  341. arbitrary code, if the data was crafted by a skilled attacker.