pytho****@googl*****
pytho****@googl*****
2011年 3月 20日 (日) 05:19:57 JST
Revision: 04540726f25c Author: Naoki INADA <inada****@klab*****> Date: Sat Mar 19 08:47:20 2011 Log: add ROOT/diff http://code.google.com/p/python-doc-ja/source/detail?r=04540726f25c Added: /diff/about.rst.diff /diff/about.rst.html /diff/bugs.rst.diff /diff/bugs.rst.html /diff/contents.rst.diff /diff/contents.rst.html /diff/copyright.rst.diff /diff/copyright.rst.html /diff/glossary.rst.diff /diff/glossary.rst.html /diff/license.rst.diff /diff/license.rst.html ======================================= --- /dev/null +++ /diff/about.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,45 @@ +--- r262/about.rst 2008-04-21 23:43:33.937018000 +0900 ++++ r266/about.rst 2010-04-23 08:19:41.899054000 +0900 +@@ -1,33 +1,36 @@ + ===================== + About these documents + ===================== + + +-These documents are generated from `reStructuredText +-<http://docutils.sf.net/rst.html>`_ sources by *Sphinx*, a document processor +-specifically written for the Python documentation. ++These documents are generated from `reStructuredText`_ sources by `Sphinx`_, a ++document processor specifically written for the Python documentation. + +-In the online version of these documents, you can submit comments and suggest +-changes directly on the documentation pages. ++.. _reStructuredText: http://docutils.sf.net/rst.html ++.. _Sphinx: http://sphinx.pocoo.org/ ++ ++.. In the online version of these documents, you can submit comments and suggest ++ changes directly on the documentation pages. + + Development of the documentation and its toolchain takes place on the + docs****@pytho***** mailing list. We're always looking for volunteers wanting + to help with the docs, so feel free to send a mail there! + + Many thanks go to: + + * Fred L. Drake, Jr., the creator of the original Python documentation toolset + and writer of much of the content; + * the `Docutils <http://docutils.sf.net/>`_ project for creating + reStructuredText and the Docutils suite; + * Fredrik Lundh for his `Alternative Python Reference + <http://effbot.org/zone/pyref.htm>`_ project from which Sphinx got many good + ideas. + +-See :ref:`reporting-bugs` for information how to report bugs in Python itself. ++See :ref:`reporting-bugs` for information how to report bugs in this ++documentation, or Python itself. + + .. including the ACKS file here so that it can be maintained separately + .. include:: ACKS.txt + + It is only with the input and contributions of the Python community + that Python has such wonderful documentation -- Thank You! ======================================= --- /dev/null +++ /diff/about.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,63 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to0__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/about.rst => r266/about.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to0__0"><a href="#difflib_chg_to0__0">f</a></td><td class="diff_header" id="from0_1">1</td><td nowrap="nowrap">=====================</td></tr> <tr><td class="diff_next" id="difflib_chg_to0__1"></td><td class="diff_header" id="from0_2">2</td><td nowrap="nowrap">About these documents</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_3">3</td><td nowrap="nowrap">=====================</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_4">4</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_5">5</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next"><a href="#difflib_chg_to0__1">n</a></td><td class="diff_header" id="from0_6">6-</td><td nowrap="nowrap">These documents are generated from `reStructuredText</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to0__1">n</a></td><td class="diff_header" id="to0_6">6+</td><td nowrap="nowrap">These documents are generated from `reStructuredText<span class="diff_add">`_ sources by `Sphinx`_, a</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from0_7">7-</td><td nowrap="nowrap"><span class="diff_sub"><http://docutils.sf.net/rst.html>`_ sources by *Sphinx*, a document processor</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from0_8">8-</td><td nowrap="nowrap">specifically written for the Python documentation.</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_7">7+</td><td nowrap="nowrap"><span class="diff_add">document processor </span>specifically written for the Python documentation.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from0_9">9</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next"><a href="#difflib_chg_to0__2">n</a></td><td class="diff_header" id="to0_9">9+</td><td nowrap="nowrap"><span class="diff_add">.. _reStructuredText: http://docutils.sf.net/rst.html</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_10">10+</td><td nowrap="nowrap"><span class="diff_add">.. _Sphinx: http://sphinx.pocoo.org/</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_11">11+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from0_10">10-</td><td nowrap="nowrap">In the online version of these documents, you can submit comments and suggest</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_12">12+</td><td nowrap="nowrap"><span class="diff_add">.. </span>In the online version of these documents, you can submit comments and suggest</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from0_11">11-</td><td nowrap="nowrap">changes directly on the documentation pages.</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_13">13+</td><td nowrap="nowrap"><span class="diff_add"> </span>changes directly on the documentation pages.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from0_12">12</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_13">13</td><td nowrap="nowrap">Development of the documentation and its toolchain takes place on the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_14">14</td><td nowrap="nowrap">docs****@pytho***** mailing list. We're always looking for volunteers wanting</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_15">15</td><td nowrap="nowrap">to help with the docs, so feel free to send a mail there!</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_16">16</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_17">17</td><td nowrap="nowrap">Many thanks go to:</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_18">18</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next" id="difflib_chg_to0__2"></td><td class="diff_header" id="from0_19">19</td><td nowrap="nowrap">* Fred L. Drake, Jr., the creator of the original Python documentation toolset</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_20">20</td><td nowrap="nowrap"> and writer of much of the content;</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_21">21</td><td nowrap="nowrap">* the `Docutils <http://docutils.sf.net/>`_ project for creating</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_22">22</td><td nowrap="nowrap"> reStructuredText and the Docutils suite;</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_23">23</td><td nowrap="nowrap">* Fredrik Lundh for his `Alternative Python Reference</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_24">24</td><td nowrap="nowrap"> <http://effbot.org/zone/pyref.htm>`_ project from which Sphinx got many good</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_25">25</td><td nowrap="nowrap"> ideas.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_26">26</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next"><a href="#difflib_chg_to0__top">t</a></td><td class="diff_header" id="from0_27">27-</td><td nowrap="nowrap">See :ref:`reporting-bugs` for information how to report bugs in <span class="diff_sub">Py</span>th<span class="diff_sub">on </span>i<span class="diff_sub">t</span>s<span class="diff_sub">elf.</span></td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to0__top">t</a></td><td class="diff_header" id="to0_29">29+</td><td nowrap="nowrap">See :ref:`reporting-bugs` for information how to report bugs in this</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to0_30">30+</td><td nowrap="nowrap"><span class="diff_add">documentation, or Python itself.</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from0_28">28</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_29">29</td><td nowrap="nowrap">.. including the ACKS file here so that it can be maintained separately</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_30">30</td><td nowrap="nowrap">.. include:: ACKS.txt</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_31">31</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_32">32</td><td nowrap="nowrap">It is only with the input and contributions of the Python community</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from0_33">33</td><td nowrap="nowrap">that Python has such wonderful documentation -- Thank You!</td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html> ======================================= --- /dev/null +++ /diff/bugs.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,85 @@ +--- r262/bugs.rst 2008-08-25 06:55:03.145253000 +0900 ++++ r266/bugs.rst 2010-04-23 08:19:41.899054000 +0900 +@@ -1,55 +1,73 @@ + .. _reporting-bugs: + +-************************ +-Reporting Bugs in Python +-************************ ++************** ++Reporting Bugs ++************** + + Python is a mature programming language which has established a reputation for + stability. In order to maintain this reputation, the developers would like to + know of any deficiencies you find in Python. + +-Bug reports should be submitted via the Python Bug Tracker ++ ++Documentation bugs ++================== ++ ++If you find a bug in this documentation or would like to propose an improvement, ++please send an e-mail to docs****@pytho***** describing the bug and where you found ++it. If you have a suggestion how to fix it, include that as well. ++ ++doc****@pytho***** is a mailing list run by volunteers; your request will be ++noticed, even if it takes a while to be processed. ++ ++Of course, if you want a more persistent record of your issue, you can use the ++issue tracker for documentation bugs as well. ++ ++ ++Using the Python issue tracker ++============================== ++ ++Bug reports for Python itself should be submitted via the Python Bug Tracker + (http://bugs.python.org/). The bug tracker offers a Web form which allows + pertinent information to be entered and submitted to the developers. + + The first step in filing a report is to determine whether the problem has + already been reported. The advantage in doing so, aside from saving the + developers time, is that you learn what has been done to fix it; it may be that + the problem has already been fixed for the next release, or additional + information is needed (in which case you are welcome to provide it if you can!). + To do this, search the bug database using the search box on the top of the page. + + If the problem you're reporting is not already in the bug tracker, go back to +-the Python Bug Tracker. If you don't already have a tracker account, select the +-"Register" link in the sidebar and undergo the registration procedure. +-Otherwise, if you're not logged in, enter your credentials and select "Login". +-It is not possible to submit a bug report anonymously. ++the Python Bug Tracker and log in. If you don't already have a tracker account, ++select the "Register" link or, if you use OpenID, one of the OpenID provider ++logos in the sidebar. It is not possible to submit a bug report anonymously. + + Being now logged in, you can submit a bug. Select the "Create New" link in the + sidebar to open the bug reporting form. + + The submission form has a number of fields. For the "Title" field, enter a + *very* short description of the problem; less than ten words is good. In the + "Type" field, select the type of your problem; also select the "Component" and + "Versions" to which the bug relates. + + In the "Comment" field, describe the problem in detail, including what you + expected to happen and what did happen. Be sure to include whether any + extension modules were involved, and what hardware and software platform you + were using (including version information as appropriate). + + Each bug report will be assigned to a developer who will determine what needs to + be done to correct the problem. You will receive an update each time action is +-taken on the bug. ++taken on the bug. See http://www.python.org/dev/workflow/ for a detailed ++description of the issue workflow. + + + .. seealso:: + + `How to Report Bugs Effectively <http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>`_ + Article which goes into some detail about how to create a useful bug report. + This describes what kind of information is useful and why it is useful. + + `Bug Writing Guidelines <http://developer.mozilla.org/en/docs/Bug_writing_guidelines>`_ + Information about writing a good bug report. Some of this is specific to the + Mozilla project, but describes general good practices. + ======================================= --- /dev/null +++ /diff/bugs.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,84 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to1__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/bugs.rst => r266/bugs.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to1__0"><a href="#difflib_chg_to1__0">f</a></td><td class="diff_header" id="from1_1">1</td><td nowrap="nowrap">.. _reporting-bugs:</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_2">2</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next" id="difflib_chg_to1__1"><a href="#difflib_chg_to1__1">n</a></td><td class="diff_header" id="from1_3">3-</td><td nowrap="nowrap"><span class="diff_sub">************************</span></td></tr> +<tr><td class="diff_next" id="difflib_chg_to1__1"><a href="#difflib_chg_to1__1">n</a></td><td class="diff_header" id="to1_3">3+</td><td nowrap="nowrap"><span class="diff_add">**************</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_4">4-</td><td nowrap="nowrap"><span class="diff_sub">Reporting Bugs in Python</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_4">4+</td><td nowrap="nowrap"><span class="diff_add">Reporting Bugs</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_5">5-</td><td nowrap="nowrap"><span class="diff_sub">************************</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_5">5+</td><td nowrap="nowrap"><span class="diff_add">**************</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from1_6">6</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_7">7</td><td nowrap="nowrap">Python is a mature programming language which has established a reputation for</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_8">8</td><td nowrap="nowrap">stability. In order to maintain this reputation, the developers would like to</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_9">9</td><td nowrap="nowrap">know of any deficiencies you find in Python.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_10">10</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next"><a href="#difflib_chg_to1__2">n</a></td><td class="diff_header" id="to1_11">11+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_12">12+</td><td nowrap="nowrap"><span class="diff_add">Documentation bugs</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_13">13+</td><td nowrap="nowrap"><span class="diff_add">==================</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_14">14+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_15">15+</td><td nowrap="nowrap"><span class="diff_add">If you find a bug in this documentation or would like to propose an improvement,</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_16">16+</td><td nowrap="nowrap"><span class="diff_add">please send an e-mail to docs****@pytho***** describing the bug and where you found</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_17">17+</td><td nowrap="nowrap"><span class="diff_add">it. If you have a suggestion how to fix it, include that as well.</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_18">18+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_19">19+</td><td nowrap="nowrap"><span class="diff_add">docs****@pytho***** is a mailing list run by volunteers; your request will be</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_20">20+</td><td nowrap="nowrap"><span class="diff_add">noticed, even if it takes a while to be processed.</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_21">21+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_22">22+</td><td nowrap="nowrap"><span class="diff_add">Of course, if you want a more persistent record of your issue, you can use the</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_23">23+</td><td nowrap="nowrap"><span class="diff_add">issue tracker for documentation bugs as well.</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_24">24+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_25">25+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_26">26+</td><td nowrap="nowrap"><span class="diff_add">Using the Python issue tracker</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_27">27+</td><td nowrap="nowrap"><span class="diff_add">==============================</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_28">28+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_11">11-</td><td nowrap="nowrap">Bug reports should be submitted via the Python Bug Tracker</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_29">29+</td><td nowrap="nowrap">Bug reports <span class="diff_add">for Python itself </span>should be submitted via the Python Bug Tracker</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from1_12">12</td><td nowrap="nowrap">(http://bugs.python.org/). The bug tracker offers a Web form which allows</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_13">13</td><td nowrap="nowrap">pertinent information to be entered and submitted to the developers.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_14">14</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next" id="difflib_chg_to1__2"></td><td class="diff_header" id="from1_15">15</td><td nowrap="nowrap">The first step in filing a report is to determine whether the problem has</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_16">16</td><td nowrap="nowrap">already been reported. The advantage in doing so, aside from saving the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_17">17</td><td nowrap="nowrap">developers time, is that you learn what has been done to fix it; it may be that</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_18">18</td><td nowrap="nowrap">the problem has already been fixed for the next release, or additional</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_19">19</td><td nowrap="nowrap">information is needed (in which case you are welcome to provide it if you can!).</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_20">20</td><td nowrap="nowrap">To do this, search the bug database using the search box on the top of the page.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_21">21</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_22">22</td><td nowrap="nowrap">If the problem you're reporting is not already in the bug tracker, go back to</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to1__3">n</a></td><td class="diff_header" id="from1_23">23-</td><td nowrap="nowrap">the Python Bug Tracker. If you don't already have a tracker account,<span class="diff_sub"> select the</span></td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to1__3">n</a></td><td class="diff_header" id="to1_41">41+</td><td nowrap="nowrap">the Python Bug Tracker<span class="diff_add"> and log in</span>. If you don't already have a tracker account,</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_24">24-</td><td nowrap="nowrap"><span class="diff_sub">"Register" link in the sidebar and undergo the registration procedure.</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_42">42+</td><td nowrap="nowrap"><span class="diff_add">select the "Register" link or, if you use OpenID, one of the OpenID provider</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_25">25-</td><td nowrap="nowrap"><span class="diff_sub">Otherwise, if you're not logged in, enter your credentials and select "Login".</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from1_26">26-</td><td nowrap="nowrap">It is not possible to submit a bug report anonymously.</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_43">43+</td><td nowrap="nowrap"><span class="diff_add">logos in the sidebar. </span>It is not possible to submit a bug report anonymously.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from1_27">27</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_28">28</td><td nowrap="nowrap">Being now logged in, you can submit a bug. Select the "Create New" link in the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_29">29</td><td nowrap="nowrap">sidebar to open the bug reporting form.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_30">30</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_31">31</td><td nowrap="nowrap">The submission form has a number of fields. For the "Title" field, enter a</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_32">32</td><td nowrap="nowrap">*very* short description of the problem; less than ten words is good. In the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_33">33</td><td nowrap="nowrap">"Type" field, select the type of your problem; also select the "Component" and</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_34">34</td><td nowrap="nowrap">"Versions" to which the bug relates.</td></tr> <tr><td class="diff_next" id="difflib_chg_to1__3"></td><td class="diff_header" id="from1_35">35</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_36">36</td><td nowrap="nowrap">In the "Comment" field, describe the problem in detail, including what you</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_37">37</td><td nowrap="nowrap">expected to happen and what did happen. Be sure to include whether any</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_38">38</td><td nowrap="nowrap">extension modules were involved, and what hardware and software platform you</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_39">39</td><td nowrap="nowrap">were using (including version information as appropriate).</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_40">40</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_41">41</td><td nowrap="nowrap">Each bug report will be assigned to a developer who will determine what needs to</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_42">42</td><td nowrap="nowrap">be done to correct the problem. You will receive an update each time action is</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to1__top">t</a></td><td class="diff_header" id="from1_43">43-</td><td nowrap="nowrap"><span class="diff_sub">taken on the bug.</span></td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to1__top">t</a></td><td class="diff_header" id="to1_60">60+</td><td nowrap="nowrap"><span class="diff_add">taken on the bug. See http://www.python.org/dev/workflow/ for a detailed</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to1_61">61+</td><td nowrap="nowrap"><span class="diff_add">description of the issue workflow.</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from1_44">44</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_45">45</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_46">46</td><td nowrap="nowrap">.. seealso::</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_47">47</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_48">48</td><td nowrap="nowrap"> `How to Report Bugs Effectively <http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>`_</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_49">49</td><td nowrap="nowrap"> Article which goes into some detail about how to create a useful bug report.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_50">50</td><td nowrap="nowrap"> This describes what kind of information is useful and why it is useful.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from1_51">51</td><td nowrap="nowrap"></td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html> ======================================= --- /dev/null +++ /diff/contents.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,22 @@ +--- r262/contents.rst 2008-10-09 03:57:31.308471000 +0900 ++++ r266/contents.rst 2009-10-28 00:08:27.384772000 +0900 +@@ -6,18 +6,19 @@ + + whatsnew/index.rst + tutorial/index.rst + using/index.rst + reference/index.rst + library/index.rst + extending/index.rst + c-api/index.rst + distutils/index.rst + install/index.rst + documenting/index.rst + howto/index.rst ++ faq/index.rst + glossary.rst + + about.rst + bugs.rst + copyright.rst + license.rst ======================================= --- /dev/null +++ /diff/contents.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,49 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to33__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/contents.rst => r266/contents.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to33__0"></td><td class="diff_header" id="from33_10">10</td><td nowrap="nowrap"> reference/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_11">11</td><td nowrap="nowrap"> library/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_12">12</td><td nowrap="nowrap"> extending/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_13">13</td><td nowrap="nowrap"> c-api/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_14">14</td><td nowrap="nowrap"> distutils/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_15">15</td><td nowrap="nowrap"> install/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_16">16</td><td nowrap="nowrap"> documenting/index.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_17">17</td><td nowrap="nowrap"> howto/index.rst</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to33__top">t</a></td><td class="diff_header" id="to33_18">18+</td><td nowrap="nowrap"><span class="diff_add"> faq/index.rst</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from33_18">18</td><td nowrap="nowrap"> glossary.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_19">19</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_20">20</td><td nowrap="nowrap"> about.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_21">21</td><td nowrap="nowrap"> bugs.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_22">22</td><td nowrap="nowrap"> copyright.rst</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from33_23">23</td><td nowrap="nowrap"> license.rst</td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html> ======================================= --- /dev/null +++ /diff/copyright.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,23 @@ +--- r262/copyright.rst 2008-03-02 15:32:32.761366000 +0900 ++++ r266/copyright.rst 2010-01-01 13:46:19.509433000 +0900 +@@ -1,19 +1,19 @@ + ********* + Copyright + ********* + + Python and this documentation is: + +-Copyright © 2001-2008 Python Software Foundation. All rights reserved. ++Copyright © 2001-2010 Python Software Foundation. All rights reserved. + + Copyright © 2000 BeOpen.com. All rights reserved. + + Copyright © 1995-2000 Corporation for National Research Initiatives. All rights + reserved. + + Copyright © 1991-1995 Stichting Mathematisch Centrum. All rights reserved. + + ------- + + See :ref:`history-and-license` for complete license and permissions information. + ======================================= --- /dev/null +++ /diff/copyright.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,50 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to34__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/copyright.rst => r266/copyright.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to34__0"><a href="#difflib_chg_to34__0">f</a></td><td class="diff_header" id="from34_1">1</td><td nowrap="nowrap">*********</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_2">2</td><td nowrap="nowrap">Copyright</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_3">3</td><td nowrap="nowrap">*********</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_4">4</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_5">5</td><td nowrap="nowrap">Python and this documentation is:</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_6">6</td><td nowrap="nowrap"></td></tr><tr><td class="diff_next"><a href="#difflib_chg_to34__top">t</a></td><td class="diff_header" id="from34_7">7-</td><td nowrap="nowrap">Copyright © 2001-200<span class="diff_sub">8</span> Python Software Foundation. All rights reserved.</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to34__top">t</a></td><td class="diff_header" id="to34_7">7+</td><td nowrap="nowrap">Copyright © 2001-20<span class="diff_add">1</span>0 Python Software Foundation. All rights reserved.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from34_8">8</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_9">9</td><td nowrap="nowrap">Copyright © 2000 BeOpen.com. All rights reserved.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_10">10</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_11">11</td><td nowrap="nowrap">Copyright © 1995-2000 Corporation for National Research Initiatives. All rights</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_12">12</td><td nowrap="nowrap">reserved.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_13">13</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_14">14</td><td nowrap="nowrap">Copyright © 1991-1995 Stichting Mathematisch Centrum. All rights reserved.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from34_15">15</td><td nowrap="nowrap"></td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html> ======================================= --- /dev/null +++ /diff/glossary.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,203 @@ +--- r262/glossary.rst 2009-04-06 06:11:43.798160000 +0900 ++++ r266/glossary.rst 2010-08-02 07:19:17.150851000 +0900 +@@ -19,29 +19,29 @@ + + 2to3 + A tool that tries to convert Python 2.x code to Python 3.x code by + handling most of the incompatibilites which can be detected by parsing the + source and traversing the parse tree. + + 2to3 is available in the standard library as :mod:`lib2to3`; a standalone + entry point is provided as :file:`Tools/scripts/2to3`. See + :ref:`2to3-reference`. + + abstract base class + Abstract Base Classes (abbreviated ABCs) complement :term:`duck-typing` by +- providing a way to define interfaces when other techniques like :func:`hasattr` +- would be clumsy. Python comes with many builtin ABCs for data structures +- (in the :mod:`collections` module), numbers (in the :mod:`numbers` +- module), and streams (in the :mod:`io` module). You can create your own +- ABC with the :mod:`abc` module. ++ providing a way to define interfaces when other techniques like ++ :func:`hasattr` would be clumsy. Python comes with many built-in ABCs for ++ data structures (in the :mod:`collections` module), numbers (in the ++ :mod:`numbers` module), and streams (in the :mod:`io` module). You can ++ create your own ABC with the :mod:`abc` module. + + argument + A value passed to a function or method, assigned to a named local + variable in the function body. A function or method may have both + positional arguments and keyword arguments in its definition. + Positional and keyword arguments may be variable-length: ``*`` accepts + or passes (if in the function definition or call) several positional + arguments in a list, while ``**`` does the same for keyword arguments + in a dictionary. + + Any expression may be used within the argument list, and the evaluated + value is passed to the local variable. +@@ -70,36 +70,36 @@ + + classic class + Any class which does not inherit from :class:`object`. See + :term:`new-style class`. Classic classes will be removed in Python 3.0. + + coercion + The implicit conversion of an instance of one type to another during an + operation which involves two arguments of the same type. For example, + ``int(3.15)`` converts the floating point number to the integer ``3``, but + in ``3+4.5``, each argument is of a different type (one int, one float), + and both must be converted to the same type before they can be added or it + will raise a ``TypeError``. Coercion between two operands can be +- performed with the ``coerce`` builtin function; thus, ``3+4.5`` is ++ performed with the ``coerce`` built-in function; thus, ``3+4.5`` is + equivalent to calling ``operator.add(*coerce(3, 4.5))`` and results in + ``operator.add(3.0, 4.5)``. Without coercion, all arguments of even + compatible types would have to be normalized to the same value by the + programmer, e.g., ``float(3)+4.5`` rather than just ``3+4.5``. + + complex number + An extension of the familiar real number system in which all numbers are + expressed as a sum of a real part and an imaginary part. Imaginary + numbers are real multiples of the imaginary unit (the square root of + ``-1``), often written ``i`` in mathematics or ``j`` in +- engineering. Python has builtin support for complex numbers, which are ++ engineering. Python has built-in support for complex numbers, which are + written with this latter notation; the imaginary part is written with a + ``j`` suffix, e.g., ``3+1j``. To get access to complex equivalents of the + :mod:`math` module, use :mod:`cmath`. Use of complex numbers is a fairly + advanced mathematical feature. If you're not aware of a need for them, + it's almost certain you can safely ignore them. + + context manager + An object which controls the environment seen in a :keyword:`with` + statement by defining :meth:`__enter__` and :meth:`__exit__` methods. + See :pep:`343`. + + CPython +@@ -151,27 +151,27 @@ + recognized by the compiler and put into the :attr:`__doc__` attribute + of the enclosing class, function or module. Since it is available via + introspection, it is the canonical place for documentation of the + object. + + duck-typing + A pythonic programming style which determines an object's type by inspection + of its method or attribute signature rather than by explicit relationship + to some type object ("If it looks like a duck and quacks like a duck, it + must be a duck.") By emphasizing interfaces rather than specific types, + well-designed code improves its flexibility by allowing polymorphic + substitution. Duck-typing avoids tests using :func:`type` or +- :func:`isinstance`. (Note, however, that duck-typing can be complemented +- with abstract base classes.) Instead, it typically employs :func:`hasattr` +- tests or :term:`EAFP` programming. ++ :func:`isinstance`. (Note, however, that duck-typing can be complemented ++ with :term:`abstract base class`\ es.) Instead, it typically employs ++ :func:`hasattr` tests or :term:`EAFP` programming. + + EAFP + Easier to ask for forgiveness than permission. This common Python coding + style assumes the existence of valid keys or attributes and catches + exceptions if the assumption proves false. This clean and fast style is + characterized by the presence of many :keyword:`try` and :keyword:`except` + statements. The technique contrasts with the :term:`LBYL` style + common to many other languages such as C. + + expression + A piece of syntax which can be evaluated to some value. In other words, + an expression is an accumulation of expression elements like literals, names, +@@ -208,38 +208,40 @@ + new feature was first added to the language and when it will become the + default:: + + >>> import __future__ + >>> __future__.division + _Feature((2, 2, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0), 8192) + + garbage collection + The process of freeing memory when it is not used anymore. Python + performs garbage collection via reference counting and a cyclic garbage + collector that is able to detect and break reference cycles. + ++ .. index:: single: generator ++ + generator + A function which returns an iterator. It looks like a normal function + except that values are returned to the caller using a :keyword:`yield` + statement instead of a :keyword:`return` statement. Generator functions + often contain one or more :keyword:`for` or :keyword:`while` loops which + :keyword:`yield` elements back to the caller. The function execution is + stopped at the :keyword:`yield` keyword (returning the result) and is + resumed there when the next element is requested by calling the + :meth:`next` method of the returned iterator. + + .. index:: single: generator expression + + generator expression +- An expression that returns a generator. It looks like a normal expression ++ An expression that returns an iterator. It looks like a normal expression + followed by a :keyword:`for` expression defining a loop variable, range, + and an optional :keyword:`if` expression. The combined expression + generates values for an enclosing function:: + + >>> sum(i*i for i in range(10)) # sum of squares 0, 1, 4, ... 81 + 285 + + GIL + See :term:`global interpreter lock`. + + global interpreter lock + The lock used by Python threads to assure that only one thread +@@ -313,25 +315,25 @@ + Interpreted languages typically have a shorter development/debug cycle + than compiled ones, though their programs generally also run more + slowly. See also :term:`interactive`. + + iterable + A container object capable of returning its members one at a + time. Examples of iterables include all sequence types (such as + :class:`list`, :class:`str`, and :class:`tuple`) and some non-sequence + types like :class:`dict` and :class:`file` and objects of any classes you + define with an :meth:`__iter__` or :meth:`__getitem__` method. Iterables + can be used in a :keyword:`for` loop and in many other places where a + sequence is needed (:func:`zip`, :func:`map`, ...). When an iterable +- object is passed as an argument to the builtin function :func:`iter`, it ++ object is passed as an argument to the built-in function :func:`iter`, it + returns an iterator for the object. This iterator is good for one pass + over the set of values. When using iterables, it is usually not necessary + to call :func:`iter` or deal with iterator objects yourself. The ``for`` + statement does that automatically for you, creating a temporary unnamed + variable to hold the iterator for the duration of the loop. See also + :term:`iterator`, :term:`sequence`, and :term:`generator`. + + iterator + An object representing a stream of data. Repeated calls to the iterator's + :meth:`next` method return successive items in the stream. When no more + data are available a :exc:`StopIteration` exception is raised instead. At + this point, the iterator object is exhausted and any further calls to its +@@ -415,25 +417,25 @@ + tuple-like object where the *year* is accessible either with an + index such as ``t[0]`` or with a named attribute like ``t.tm_year``). + + A named tuple can be a built-in type such as :class:`time.struct_time`, + or it can be created with a regular class definition. A full featured + named tuple can also be created with the factory function + :func:`collections.namedtuple`. The latter approach automatically + provides extra features such as a self-documenting representation like + ``Employee(name='jones', title='programmer')``. + + namespace + The place where a variable is stored. Namespaces are implemented as +- dictionaries. There are the local, global and builtin namespaces as well ++ dictionaries. There are the local, global and built-in namespaces as well + as nested namespaces in objects (in methods). Namespaces support + modularity by preventing naming conflicts. For instance, the functions + :func:`__builtin__.open` and :func:`os.open` are distinguished by their + namespaces. Namespaces also aid readability and maintainability by making + it clear which module implements a function. For instance, writing + :func:`random.seed` or :func:`itertools.izip` makes it clear that those + functions are implemented by the :mod:`random` and :mod:`itertools` + modules, respectively. + + nested scope + The ability to refer to a variable in an enclosing definition. For + instance, a function defined inside another function can refer to ======================================= --- /dev/null +++ /diff/glossary.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,86 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to45__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/glossary.rst => r266/glossary.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__0"></td><td class="diff_header" id="from45_23">23</td><td nowrap="nowrap"> source and traversing the parse tree.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_24">24</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_25">25</td><td nowrap="nowrap"> 2to3 is available in the standard library as :mod:`lib2to3`; a standalone</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_26">26</td><td nowrap="nowrap"> entry point is provided as :file:`Tools/scripts/2to3`. See</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_27">27</td><td nowrap="nowrap"> :ref:`2to3-reference`.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_28">28</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_29">29</td><td nowrap="nowrap"> abstract base class</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_30">30</td><td nowrap="nowrap"> Abstract Base Classes (abbreviated ABCs) complement :term:`duck-typing` by</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__1">n</a></td><td class="diff_header" id="from45_31">31-</td><td nowrap="nowrap"> providing a way to define interfaces when other techniques like<span class="diff_sub"> :func:`hasattr`</span></td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__1">n</a></td><td class="diff_header" id="to45_31">31+</td><td nowrap="nowrap"> providing a way to define interfaces when other techniques like</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_32">32-</td><td nowrap="nowrap"> would be clumsy. Python comes with many builtin ABCs for<span class="diff_sub"> data structures</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_32">32+</td><td nowrap="nowrap"> <span class="diff_add"> :func:`hasattr`</span> would be clumsy. Python comes with many built<span class="diff_add">-</span>in ABCs for</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_33">33-</td><td nowrap="nowrap"> (in the :mod:`collections` module), numbers (in the<span class="diff_sub"> :mod:`numbers`</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_33">33+</td><td nowrap="nowrap"> <span class="diff_add"> data structures</span> (in the :mod:`collections` module), numbers (in the</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_34">34-</td><td nowrap="nowrap"> module), and streams (in the :mod:`io` module). You can<span class="diff_sub"> create your own</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_34">34+</td><td nowrap="nowrap"> <span class="diff_add"> :mod:`numbers`</span> module), and streams (in the :mod:`io` module). You can</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_35">35-</td><td nowrap="nowrap"> ABC with the :mod:`abc` module.</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_35">35+</td><td nowrap="nowrap"> <span class="diff_add"> create your own</span> ABC with the :mod:`abc` module.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_36">36</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_37">37</td><td nowrap="nowrap"> argument</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_38">38</td><td nowrap="nowrap"> A value passed to a function or method, assigned to a named local</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_39">39</td><td nowrap="nowrap"> variable in the function body. A function or method may have both</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_40">40</td><td nowrap="nowrap"> positional arguments and keyword arguments in its definition.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_41">41</td><td nowrap="nowrap"> Positional and keyword arguments may be variable-length: ``*`` accepts</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_42">42</td><td nowrap="nowrap"> or passes (if in the function definition or call) several positional</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_43">43</td><td nowrap="nowrap"> arguments in a list, while ``**`` does the same for keyword arguments</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__1"></td><td class="diff_header" id="from45_74">74</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_75">75</td><td nowrap="nowrap"> coercion</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_76">76</td><td nowrap="nowrap"> The implicit conversion of an instance of one type to another during an</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_77">77</td><td nowrap="nowrap"> operation which involves two arguments of the same type. For example,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_78">78</td><td nowrap="nowrap"> ``int(3.15)`` converts the floating point number to the integer ``3``, but</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_79">79</td><td nowrap="nowrap"> in ``3+4.5``, each argument is of a different type (one int, one float),</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_80">80</td><td nowrap="nowrap"> and both must be converted to the same type before they can be added or it</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_81">81</td><td nowrap="nowrap"> will raise a ``TypeError``. Coercion between two operands can be</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__2">n</a></td><td class="diff_header" id="from45_82">82-</td><td nowrap="nowrap"> performed with the ``coerce`` builtin function; thus, ``3+4.5`` is</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__2">n</a></td><td class="diff_header" id="to45_82">82+</td><td nowrap="nowrap"> performed with the ``coerce`` built<span class="diff_add">-</span>in function; thus, ``3+4.5`` is</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_83">83</td><td nowrap="nowrap"> equivalent to calling ``operator.add(*coerce(3, 4.5))`` and results in</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_84">84</td><td nowrap="nowrap"> ``operator.add(3.0, 4.5)``. Without coercion, all arguments of even</td></tr> <tr><td class="diff_next" id="difflib_chg_to45__2"></td><td class="diff_header" id="from45_85">85</td><td nowrap="nowrap"> compatible types would have to be normalized to the same value by the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_86">86</td><td nowrap="nowrap"> programmer, e.g., ``float(3)+4.5`` rather than just ``3+4.5``.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_87">87</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_88">88</td><td nowrap="nowrap"> complex number</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_89">89</td><td nowrap="nowrap"> An extension of the familiar real number system in which all numbers are</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_90">90</td><td nowrap="nowrap"> expressed as a sum of a real part and an imaginary part. Imaginary</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_91">91</td><td nowrap="nowrap"> numbers are real multiples of the imaginary unit (the square root of</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_92">92</td><td nowrap="nowrap"> ``-1``), often written ``i`` in mathematics or ``j`` in</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__3">n</a></td><td class="diff_header" id="from45_93">93-</td><td nowrap="nowrap"> engineering. Python has builtin support for complex numbers, which are</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__3">n</a></td><td class="diff_header" id="to45_93">93+</td><td nowrap="nowrap"> engineering. <span class="diff_add"> </span>Python has built<span class="diff_add">-</span>in support for complex numbers, which are</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_94">94</td><td nowrap="nowrap"> written with this latter notation; the imaginary part is written with a</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_95">95</td><td nowrap="nowrap"> ``j`` suffix, e.g., ``3+1j``. To get access to complex equivalents of the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_96">96</td><td nowrap="nowrap"> :mod:`math` module, use :mod:`cmath`. Use of complex numbers is a fairly</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_97">97</td><td nowrap="nowrap"> advanced mathematical feature. If you're not aware of a need for them,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_98">98</td><td nowrap="nowrap"> it's almost certain you can safely ignore them.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_99">99</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_100">100</td><td nowrap="nowrap"> context manager</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_101">101</td><td nowrap="nowrap"> An object which controls the environment seen in a :keyword:`with`</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__3"></td><td class="diff_header" id="from45_155">155</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_156">156</td><td nowrap="nowrap"> duck-typing</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_157">157</td><td nowrap="nowrap"> A pythonic programming style which determines an object's type by inspection</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_158">158</td><td nowrap="nowrap"> of its method or attribute signature rather than by explicit relationship</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_159">159</td><td nowrap="nowrap"> to some type object ("If it looks like a duck and quacks like a duck, it</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_160">160</td><td nowrap="nowrap"> must be a duck.") By emphasizing interfaces rather than specific types,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_161">161</td><td nowrap="nowrap"> well-designed code improves its flexibility by allowing polymorphic</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_162">162</td><td nowrap="nowrap"> substitution. Duck-typing avoids tests using :func:`type` or</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__4">n</a></td><td class="diff_header" id="from45_163">163-</td><td nowrap="nowrap"> :func:`isinstance`. (Note, however, that duck-typing can be complemented</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__4">n</a></td><td class="diff_header" id="to45_163">163+</td><td nowrap="nowrap"> :func:`isinstance`. <span class="diff_add"> </span>(Note, however, that duck-typing can be complemented</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_164">164-</td><td nowrap="nowrap"> with abstract base classes.) Instead, it typically employs<span class="diff_sub"> :func:`hasattr`</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_164">164+</td><td nowrap="nowrap"> with <span class="diff_add">:term:`</span>abstract base class<span class="diff_add">`\ </span>es.)<span class="diff_add"> </span> Instead, it typically employs</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="from45_165">165-</td><td nowrap="nowrap"> tests or :term:`EAFP` programming.</td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_165">165+</td><td nowrap="nowrap"> <span class="diff_add"> :func:`hasattr`</span> tests or :term:`EAFP` programming.</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_166">166</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_167">167</td><td nowrap="nowrap"> EAFP</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_168">168</td><td nowrap="nowrap"> Easier to ask for forgiveness than permission. This common Python coding</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_169">169</td><td nowrap="nowrap"> style assumes the existence of valid keys or attributes and catches</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_170">170</td><td nowrap="nowrap"> exceptions if the assumption proves false. This clean and fast style is</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_171">171</td><td nowrap="nowrap"> characterized by the presence of many :keyword:`try` and :keyword:`except`</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_172">172</td><td nowrap="nowrap"> statements. The technique contrasts with the :term:`LBYL` style</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_173">173</td><td nowrap="nowrap"> common to many other languages such as C.</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__4"></td><td class="diff_header" id="from45_211">211</td><td nowrap="nowrap"> >>> import __future__</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_212">212</td><td nowrap="nowrap"> >>> __future__.division</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_213">213</td><td nowrap="nowrap"> _Feature((2, 2, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0), 8192)</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_214">214</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_215">215</td><td nowrap="nowrap"> garbage collection</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_216">216</td><td nowrap="nowrap"> The process of freeing memory when it is not used anymore. Python</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_217">217</td><td nowrap="nowrap"> performs garbage collection via reference counting and a cyclic garbage</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_218">218</td><td nowrap="nowrap"> collector that is able to detect and break reference cycles.</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__5">n</a></td><td class="diff_header" id="to45_219">219+</td><td nowrap="nowrap"><span class="diff_add"> </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to45_220">220+</td><td nowrap="nowrap"><span class="diff_add"> .. index:: single: generator</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_219">219</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_220">220</td><td nowrap="nowrap"> generator</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_221">221</td><td nowrap="nowrap"> A function which returns an iterator. It looks like a normal function</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_222">222</td><td nowrap="nowrap"> except that values are returned to the caller using a :keyword:`yield`</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_223">223</td><td nowrap="nowrap"> statement instead of a :keyword:`return` statement. Generator functions</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_224">224</td><td nowrap="nowrap"> often contain one or more :keyword:`for` or :keyword:`while` loops which</td></tr> <tr><td class="diff_next" id="difflib_chg_to45__5"></td><td class="diff_header" id="from45_225">225</td><td nowrap="nowrap"> :keyword:`yield` elements back to the caller. The function execution is</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_226">226</td><td nowrap="nowrap"> stopped at the :keyword:`yield` keyword (returning the result) and is</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_227">227</td><td nowrap="nowrap"> resumed there when the next element is requested by calling the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_228">228</td><td nowrap="nowrap"> :meth:`next` method of the returned iterator.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_229">229</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_230">230</td><td nowrap="nowrap"> .. index:: single: generator expression</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_231">231</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_232">232</td><td nowrap="nowrap"> generator expression</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__6">n</a></td><td class="diff_header" id="from45_233">233-</td><td nowrap="nowrap"> An expression that returns a<span class="diff_sub"> ge</span>nerator. It looks like a normal expression</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__6">n</a></td><td class="diff_header" id="to45_235">235+</td><td nowrap="nowrap"> An expression that returns an<span class="diff_add"> it</span>erator. It looks like a normal expression</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_234">234</td><td nowrap="nowrap"> followed by a :keyword:`for` expression defining a loop variable, range,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_235">235</td><td nowrap="nowrap"> and an optional :keyword:`if` expression. The combined expression</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_236">236</td><td nowrap="nowrap"> generates values for an enclosing function::</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_237">237</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_238">238</td><td nowrap="nowrap"> >>> sum(i*i for i in range(10)) # sum of squares 0, 1, 4, ... 81</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_239">239</td><td nowrap="nowrap"> 285</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_240">240</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_241">241</td><td nowrap="nowrap"> GIL</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__6"></td><td class="diff_header" id="from45_317">317</td><td nowrap="nowrap"> iterable</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_318">318</td><td nowrap="nowrap"> A container object capable of returning its members one at a</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_319">319</td><td nowrap="nowrap"> time. Examples of iterables include all sequence types (such as</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_320">320</td><td nowrap="nowrap"> :class:`list`, :class:`str`, and :class:`tuple`) and some non-sequence</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_321">321</td><td nowrap="nowrap"> types like :class:`dict` and :class:`file` and objects of any classes you</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_322">322</td><td nowrap="nowrap"> define with an :meth:`__iter__` or :meth:`__getitem__` method. Iterables</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_323">323</td><td nowrap="nowrap"> can be used in a :keyword:`for` loop and in many other places where a</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_324">324</td><td nowrap="nowrap"> sequence is needed (:func:`zip`, :func:`map`, ...). When an iterable</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__7">n</a></td><td class="diff_header" id="from45_325">325-</td><td nowrap="nowrap"> object is passed as an argument to the builtin function :func:`iter`, it</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__7">n</a></td><td class="diff_header" id="to45_327">327+</td><td nowrap="nowrap"> object is passed as an argument to the built<span class="diff_add">-</span>in function :func:`iter`, it</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_326">326</td><td nowrap="nowrap"> returns an iterator for the object. This iterator is good for one pass</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_327">327</td><td nowrap="nowrap"> over the set of values. When using iterables, it is usually not necessary</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_328">328</td><td nowrap="nowrap"> to call :func:`iter` or deal with iterator objects yourself. The ``for``</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_329">329</td><td nowrap="nowrap"> statement does that automatically for you, creating a temporary unnamed</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_330">330</td><td nowrap="nowrap"> variable to hold the iterator for the duration of the loop. See also</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_331">331</td><td nowrap="nowrap"> :term:`iterator`, :term:`sequence`, and :term:`generator`.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_332">332</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_333">333</td><td nowrap="nowrap"> iterator</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to45__7"></td><td class="diff_header" id="from45_419">419</td><td nowrap="nowrap"> or it can be created with a regular class definition. A full featured</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_420">420</td><td nowrap="nowrap"> named tuple can also be created with the factory function</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_421">421</td><td nowrap="nowrap"> :func:`collections.namedtuple`. The latter approach automatically</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_422">422</td><td nowrap="nowrap"> provides extra features such as a self-documenting representation like</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_423">423</td><td nowrap="nowrap"> ``Employee(name='jones', title='programmer')``.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_424">424</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_425">425</td><td nowrap="nowrap"> namespace</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_426">426</td><td nowrap="nowrap"> The place where a variable is stored. Namespaces are implemented as</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to45__top">t</a></td><td class="diff_header" id="from45_427">427-</td><td nowrap="nowrap"> dictionaries. There are the local, global and builtin namespaces as well</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to45__top">t</a></td><td class="diff_header" id="to45_429">429+</td><td nowrap="nowrap"> dictionaries. There are the local, global and built<span class="diff_add">-</span>in namespaces as well</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from45_428">428</td><td nowrap="nowrap"> as nested namespaces in objects (in methods). Namespaces support</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_429">429</td><td nowrap="nowrap"> modularity by preventing naming conflicts. For instance, the functions</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_430">430</td><td nowrap="nowrap"> :func:`__builtin__.open` and :func:`os.open` are distinguished by their</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_431">431</td><td nowrap="nowrap"> namespaces. Namespaces also aid readability and maintainability by making</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_432">432</td><td nowrap="nowrap"> it clear which module implements a function. For instance, writing</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_433">433</td><td nowrap="nowrap"> :func:`random.seed` or :func:`itertools.izip` makes it clear that those</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_434">434</td><td nowrap="nowrap"> functions are implemented by the :mod:`random` and :mod:`itertools`</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from45_435">435</td><td nowrap="nowrap"> modules, respectively.</td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html> ======================================= --- /dev/null +++ /diff/license.rst.diff Sat Mar 19 08:47:20 2011 @@ -0,0 +1,89 @@ +--- r262/license.rst 2009-01-04 06:55:17.853888000 +0900 ++++ r266/license.rst 2010-03-02 07:16:51.561035000 +0900 +@@ -87,24 +87,32 @@ + | 2.5 | 2.4 | 2006 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ + | 2.5.1 | 2.5 | 2007 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ + | 2.5.2 | 2.5.1 | 2008 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ + | 2.5.3 | 2.5.2 | 2008 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ + | 2.6 | 2.5 | 2008 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ + | 2.6.1 | 2.6 | 2008 | PSF | yes | + +----------------+--------------+-----------+------------+-----------------+ ++| 2.6.2 | 2.6.1 | 2009 | PSF | yes | +++----------------+--------------+-----------+------------+-----------------+ ++| 2.6.3 | 2.6.2 | 2009 | PSF | yes | +++----------------+--------------+-----------+------------+-----------------+ ++| 2.6.4 | 2.6.3 | 2009 | PSF | yes | +++----------------+--------------+-----------+------------+-----------------+ ++| 2.6.5 | 2.6.4 | 2010 | PSF | yes | +++----------------+--------------+-----------+------------+-----------------+ + + .. note:: + + GPL-compatible doesn't mean that we're distributing Python under the GPL. All + Python licenses, unlike the GPL, let you distribute a modified version without + making your changes open source. The GPL-compatible licenses make it possible to + combine Python with other software that is released under the GPL; the others + don't. + + Thanks to the many outside volunteers who have worked under Guido's direction to + make these releases possible. + +@@ -115,25 +123,25 @@ + + .. centered:: PSF LICENSE AGREEMENT FOR PYTHON |release| + + #. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and + the Individual or Organization ("Licensee") accessing and otherwise using Python + |release| software in source or binary form and its associated documentation. + + #. Subject to the terms and conditions of this License Agreement, PSF hereby + grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, + analyze, test, perform and/or display publicly, prepare derivative works, + distribute, and otherwise use Python |release| alone or in any derivative + version, provided, however, that PSF's License Agreement and PSF's notice of +- copyright, i.e., "Copyright © 2001-2009 Python Software Foundation; All Rights ++ copyright, i.e., "Copyright © 2001-2010 Python Software Foundation; All Rights + Reserved" are retained in Python |release| alone or in any derivative version + prepared by Licensee. + + #. In the event Licensee prepares a derivative work that is based on or + incorporates Python |release| or any part thereof, and wants to make the + derivative work available to others as provided herein, then Licensee hereby + agrees to include in any such work a brief summary of the changes made to Python + |release|. + + #. PSF is making Python |release| available to Licensee on an "AS IS" basis. + PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF + EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR +@@ -609,25 +617,25 @@ + LANCE ELLINGHOUSE DISCLAIMS ALL WARRANTIES WITH REGARD TO + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL LANCE ELLINGHOUSE CENTRUM BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + Modified by Jack Jansen, CWI, July 1995: + - Use binascii module to do the actual line-by-line conversion + between ascii and binary. This results in a 1000-fold speedup. The C + version is still 5 times faster, though. +- - Arguments more compliant with python standard ++ - Arguments more compliant with Python standard + + + XML Remote Procedure Calls + -------------------------- + + The :mod:`xmlrpclib` module contains the following notice:: + + The XML-RPC client interface is + + Copyright (c) 1999-2002 by Secret Labs AB + Copyright (c) 1999-2002 by Fredrik Lundh + ======================================= --- /dev/null +++ /diff/license.rst.html Sat Mar 19 08:47:20 2011 @@ -0,0 +1,64 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html> + +<head> + <meta http-equiv="Content-Type" + content="text/html; charset=ISO-8859-1" /> + <title></title> + <style type="text/css"> + table.diff {font-family:Courier; border:medium;} + .diff_header {background-color:#e0e0e0} + td.diff_header {text-align:right} + .diff_next {background-color:#c0c0c0} + .diff_add {background-color:#aaffaa} + .diff_chg {background-color:#ffff77} + .diff_sub {background-color:#ffaaaa} + </style> +</head> + +<body> + + <table class="diff" id="difflib_chg_to243__top" + cellspacing="0" cellpadding="0" rules="groups" > + <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup> + <thead><tr><th class="diff_next"><br /></th><th colspan="2" class="diff_header">r262/license.rst => r266/license.rst</th></tr></thead> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to243__0"></td><td class="diff_header" id="from243_91">91</td><td nowrap="nowrap">| 2.5.2 | 2.5.1 | 2008 | PSF | yes | </td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_92">92</td><td nowrap="nowrap">+----------------+--------------+-----------+------------+-----------------+</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_93">93</td><td nowrap="nowrap">| 2.5.3 | 2.5.2 | 2008 | PSF | yes | </td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_94">94</td><td nowrap="nowrap">+----------------+--------------+-----------+------------+-----------------+</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_95">95</td><td nowrap="nowrap">| 2.6 | 2.5 | 2008 | PSF | yes | </td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_96">96</td><td nowrap="nowrap">+----------------+--------------+-----------+------------+-----------------+</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_97">97</td><td nowrap="nowrap">| 2.6.1 | 2.6 | 2008 | PSF | yes | </td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_98">98</td><td nowrap="nowrap">+----------------+--------------+-----------+------------+-----------------+</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to243__1">n</a></td><td class="diff_header" id="to243_99">99+</td><td nowrap="nowrap"><span class="diff_add">| 2.6.2 | 2.6.1 | 2009 | PSF | yes | </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_100">100+</td><td nowrap="nowrap"><span class="diff_add">+----------------+--------------+-----------+------------+-----------------+</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_101">101+</td><td nowrap="nowrap"><span class="diff_add">| 2.6.3 | 2.6.2 | 2009 | PSF | yes | </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_102">102+</td><td nowrap="nowrap"><span class="diff_add">+----------------+--------------+-----------+------------+-----------------+</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_103">103+</td><td nowrap="nowrap"><span class="diff_add">| 2.6.4 | 2.6.3 | 2009 | PSF | yes | </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_104">104+</td><td nowrap="nowrap"><span class="diff_add">+----------------+--------------+-----------+------------+-----------------+</span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_105">105+</td><td nowrap="nowrap"><span class="diff_add">| 2.6.5 | 2.6.4 | 2010 | PSF | yes | </span></td></tr> +<tr><td class="diff_next"></td><td class="diff_header" id="to243_106">106+</td><td nowrap="nowrap"><span class="diff_add">+----------------+--------------+-----------+------------+-----------------+</span></td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from243_99">99</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_100">100</td><td nowrap="nowrap">.. note::</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_101">101</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_102">102</td><td nowrap="nowrap"> GPL-compatible doesn't mean that we're distributing Python under the GPL. All</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_103">103</td><td nowrap="nowrap"> Python licenses, unlike the GPL, let you distribute a modified version without</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_104">104</td><td nowrap="nowrap"> making your changes open source. The GPL-compatible licenses make it possible to</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_105">105</td><td nowrap="nowrap"> combine Python with other software that is released under the GPL; the others</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_106">106</td><td nowrap="nowrap"> don't.</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to243__1"></td><td class="diff_header" id="from243_119">119</td><td nowrap="nowrap"> the Individual or Organization ("Licensee") accessing and otherwise using Python</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_120">120</td><td nowrap="nowrap"> |release| software in source or binary form and its associated documentation.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_121">121</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_122">122</td><td nowrap="nowrap">#. Subject to the terms and conditions of this License Agreement, PSF hereby</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_123">123</td><td nowrap="nowrap"> grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_124">124</td><td nowrap="nowrap"> analyze, test, perform and/or display publicly, prepare derivative works,</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_125">125</td><td nowrap="nowrap"> distribute, and otherwise use Python | release| alone or in any derivative</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_126">126</td><td nowrap="nowrap"> version, provided, however, that PSF's License Agreement and PSF's notice of</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to243__2">n</a></td><td class="diff_header" id="from243_127">127-</td><td nowrap="nowrap"> copyright, i.e., "Copyright © 2001-200<span class="diff_sub">9</span> Python Software Foundation; All Rights</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to243__2">n</a></td><td class="diff_header" id="to243_135">135+</td><td nowrap="nowrap"> copyright, i.e., "Copyright © 2001-20<span class="diff_add">1</span>0 Python Software Foundation; All Rights</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from243_128">128</td><td nowrap="nowrap"> Reserved" are retained in Python | release| alone or in any derivative version</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_129">129</td><td nowrap="nowrap"> prepared by Licensee.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_130">130</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_131">131</td><td nowrap="nowrap">#. In the event Licensee prepares a derivative work that is based on or</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_132">132</td><td nowrap="nowrap"> incorporates Python |release| or any part thereof, and wants to make the</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_133">133</td><td nowrap="nowrap"> derivative work available to others as provided herein, then Licensee hereby</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_134">134</td><td nowrap="nowrap"> agrees to include in any such work a brief summary of the changes made to Python</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_135">135</td><td nowrap="nowrap"> | release|.</td></tr> </tbody> + <tbody> + <tr><td class="diff_next" id="difflib_chg_to243__2"></td><td class="diff_header" id="from243_613">613</td><td nowrap="nowrap"> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_614">614</td><td nowrap="nowrap"> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_615">615</td><td nowrap="nowrap"> OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_616">616</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_617">617</td><td nowrap="nowrap"> Modified by Jack Jansen, CWI, July 1995:</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_618">618</td><td nowrap="nowrap"> - Use binascii module to do the actual line-by-line conversion</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_619">619</td><td nowrap="nowrap"> between ascii and binary. This results in a 1000-fold speedup. The C</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_620">620</td><td nowrap="nowrap"> version is still 5 times faster, though.</td></tr><tr><td class="diff_next"><a href="#difflib_chg_to243__top">t</a></td><td class="diff_header" id="from243_621">621-</td><td nowrap="nowrap"> - Arguments more compliant with <span class="diff_chg">p</span>ython standard</td></tr> +<tr><td class="diff_next"><a href="#difflib_chg_to243__top">t</a></td><td class="diff_header" id="to243_629">629+</td><td nowrap="nowrap"> - Arguments more compliant with <span class="diff_chg">P</span>ython standard</td></tr> + <tr><td class="diff_next"></td><td class="diff_header" id="from243_622">622</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_623">623</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_624">624</td><td nowrap="nowrap">XML Remote Procedure Calls</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_625">625</td><td nowrap="nowrap">--------------------------</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_626">626</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_627">627</td><td nowrap="nowrap">The :mod:`xmlrpclib` module contains the following notice::</td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_628">628</td><td nowrap="nowrap"></td></tr> <tr><td class="diff_next"></td><td class="diff_header" id="from243_629">629</td><td nowrap="nowrap"> The XML-RPC client interface is</td></tr> </tbody> + </table> + <table class="diff" summary="Legends"> + <tr> <th colspan="2"> Legends </th> </tr> + <tr> <td> <table border="" summary="Colors"> + <tr><th> Colors </th> </tr> + <tr><td class="diff_add"> Added </td></tr> + <tr><td class="diff_chg">Changed</td> </tr> + <tr><td class="diff_sub">Deleted</td> </tr> + </table></td> + <td> <table border="" summary="Links"> + <tr><th colspan="2"> Links </th> </tr> + <tr><td>(f)irst change</td> </tr> + <tr><td>(n)ext change</td> </tr> + <tr><td>(t)op</td> </tr> + </table></td> </tr> + </table> +</body> + +</html>
