Benjamin Peterson
ca6142948e
merge 3.3
2013-01-03 20:34:58 -08:00
Benjamin Peterson
bf064b3911
merge 3.2
2013-01-03 20:34:49 -08:00
Benjamin Peterson
d73f369f4c
merge heads
2013-01-03 20:34:40 -08:00
Benjamin Peterson
0a2c4f55c4
drop email ( closes #16857 )
2013-01-03 20:34:19 -08:00
Ezio Melotti
f422676423
#16747 : merge with 3.3.
2013-01-02 22:29:57 +02:00
Ezio Melotti
407c2ac4f7
#16747 : merge with 3.2.
2013-01-02 22:29:41 +02:00
Ezio Melotti
d581fff6f0
#16747 : fix link to file objects in the glossary.
2013-01-02 22:29:09 +02:00
Eli Bendersky
cc85a156ae
Fix method name in documentation (__setstate__ --> __getstate__)
2013-01-02 05:55:17 -08:00
Eli Bendersky
a6d0dd5dc3
Fix method name in documentation (__setstate__ --> __getstate__)
2013-01-02 05:54:36 -08:00
Eli Bendersky
78f3ce577f
Fix method name in documentation (__setstate__ --> __getstate__)
2013-01-02 05:53:59 -08:00
Serhiy Storchaka
805ae0d39d
Fix incorrect grammar in sched documentation.
2013-01-02 12:32:10 +02:00
Serhiy Storchaka
75b936ec7f
Fix incorrect grammar in sched documentation.
2013-01-02 12:31:26 +02:00
Benjamin Peterson
ca319cf94e
merge 3.3
2012-12-31 21:44:06 -06:00
Benjamin Peterson
a63ecedfa0
update another year
2012-12-31 21:44:00 -06:00
Benjamin Peterson
ae2039e62c
merge 3.3
2012-12-31 21:37:30 -06:00
Benjamin Peterson
198399d92c
bring Python into 2013
2012-12-31 21:37:21 -06:00
Łukasz Langa
1dce0003a6
Merged parser.clean() fix (issue #16820 ) from 3.2 through 3.3.
2012-12-31 03:43:37 +01:00
Łukasz Langa
0dc5ab41f0
Merged parser.clean() fix (issue #16820 ) from 3.2.
2012-12-31 03:41:54 +01:00
Łukasz Langa
3a8479a583
Fixes parser.clean() reported in issue #16820 .
2012-12-31 03:38:39 +01:00
Serhiy Storchaka
44c66c72c9
Issue #16486 : Make aifc files work with 'with' as context managers.
2012-12-29 22:54:49 +02:00
Serhiy Storchaka
3c80ce45e4
Issue #16641 : Fix default values of sched.scheduler.enter arguments were modifiable.
2012-12-29 21:15:24 +02:00
Serhiy Storchaka
c04957bff3
Issue #16641 : Fix default values of sched.scheduler.enter arguments were modifiable.
2012-12-29 21:13:45 +02:00
Serhiy Storchaka
d1ced9e86a
Issue #16642 : Document kwargs field in sched.Event named tuple.
2012-12-29 20:59:29 +02:00
Serhiy Storchaka
e912496c60
Issue #16642 : Document kwargs field in sched.Event named tuple.
2012-12-29 20:57:52 +02:00
Ezio Melotti
774715cd81
#16796 : merge with 3.3.
2012-12-28 02:00:41 +02:00
Ezio Melotti
63ee149ca6
#16796 : merge with 3.2.
2012-12-28 02:00:22 +02:00
Ezio Melotti
52336f0b50
#16796 : fix typo. Patch by Michael Schurter.
2012-12-28 01:59:24 +02:00
Serhiy Storchaka
464a218e77
Issue #16682 : Replace "Python string" to "bytes object" in audioop documentation.
2012-12-27 20:47:30 +02:00
Serhiy Storchaka
e261055eaf
Issue #16682 : Replace "Python string" to "bytes object" in audioop documentation.
2012-12-27 20:46:19 +02:00
Serhiy Storchaka
c8bd74ddfd
Issue #16682 : Replace "Python string" to "bytes object" in audioop documentation.
2012-12-27 20:43:36 +02:00
Jesus Cea
cdf680f54c
MERGE: Closes #16789 : :meth:quit links to constants instead of own module
2012-12-26 16:48:26 +01:00
Jesus Cea
aa24468c9b
MERGE: Closes #16789 : :meth:quit links to constants instead of own module
2012-12-26 16:47:40 +01:00
Jesus Cea
c73f863a8d
Closes #16789 : :meth:quit links to constants instead of own module
2012-12-26 16:47:03 +01:00
Kristján Valur Jónsson
cacb400345
Merge with 3.3
...
Issue #14574 : Ignore socket errors raised when flushing a connection on close.
2012-12-26 15:15:17 +00:00
Kristján Valur Jónsson
c8e7e2bb76
Merge with 3.2 :
...
Issue #14574 : Ignore socket errors raised when flushing a connection on close.
2012-12-26 15:13:29 +00:00
Brian Curtin
490b32a397
Fix #11939 . Set st_dev attribute on Windows to simplify os.path.samefile.
...
By setting the st_dev attribute, we can then remove some Windows-specific
code and move os.path.samefile/sameopenfile/samestat to Lib/genericpath.py
so all platforms share the same implementation.
2012-12-26 07:03:03 -06:00
Chris Jerdonek
c475278a94
Merge from 3.3: add links and index entries for "argument" and "parameter."
...
This adds to the work done for issue #15990 (i.e. f44b8d69e5fc and the
commits referenced there).
2012-12-25 14:59:46 -08:00
Chris Jerdonek
32bbc1c396
Merge from 3.2: add links and index entries for "argument" and "parameter."
...
This adds to the work done for issue #15990 (i.e. f44b8d69e5fc and the
commits referenced there).
2012-12-25 14:57:54 -08:00
Chris Jerdonek
b43099464a
Add additional links and index entries for "argument" and "parameter".
...
This adds to the work done for issue #15990 (i.e. f44b8d69e5fc and the
commits referenced there).
2012-12-25 14:54:44 -08:00
Kristján Valur Jónsson
36852b7844
Issue #14574 : Ignore socket errors raised when flushing a connection on close.
2012-12-25 22:46:32 +00:00
Chris Jerdonek
b7c2386a3f
Fix Sphinx warning (missing "setting-envvars" reference).
...
This fixes the following warning when building the docs (probably from
the commit for issue #14901 ):
"/Doc/faq/windows.rst:138: WARNING: undefined label: setting-envvars (if the
link has no caption the label must precede a section header)"
2012-12-25 15:26:24 -08:00
Ezio Melotti
e34ccb6861
#16760 : merge with 3.3.
2012-12-25 18:16:31 +02:00
Ezio Melotti
1bdb638ce3
#16760 : merge with 3.2.
2012-12-25 18:15:28 +02:00
Ezio Melotti
090f7be6df
#16760 : use ref:match-objects instead of :class:MatchObject.
2012-12-25 18:10:49 +02:00
Ezio Melotti
16bdd4120d
#16677 : merge with 3.3.
2012-12-25 15:47:41 +02:00
Ezio Melotti
1be057673a
#16677 : merge with 3.2.
2012-12-25 15:46:58 +02:00
Ezio Melotti
9f929bb7df
#16677 : rename section header and fix markup.
2012-12-25 15:45:15 +02:00
Chris Jerdonek
7d2fad1be2
Merge from 3.3: link to "yield from" examples in yield documentation.
2012-12-23 15:35:23 -08:00
Chris Jerdonek
2654b86e88
Link to "yield from" examples in yield documentation.
...
This commit also simplifies the more advanced "yield from" example and removes
unused function parameters.
2012-12-23 15:31:57 -08:00
Andrew Svetlov
0794fe0356
Add NEWS and docs for #9856
2012-12-23 15:12:19 +02:00
