Georg Brandl
74b6abf61f
Merge with 3.2.
2011-08-13 11:48:40 +02:00
Georg Brandl
3abb372c81
Fix #11513 : wrong exception handling for the case that GzipFile itself raises an IOError.
2011-08-13 11:48:12 +02:00
Benjamin Peterson
3672c4e21f
merge 3.2
2011-08-13 00:33:29 -05:00
Benjamin Peterson
963e40256a
tokenize is just broken on test_pep3131.py
2011-08-13 00:33:21 -05:00
Benjamin Peterson
478267f9c4
merge 3.2
2011-08-12 23:35:46 -05:00
Benjamin Peterson
be66287e20
normalization is different between unicode builds, so use a new non-BMP char and add normalization test
2011-08-12 23:35:34 -05:00
Benjamin Peterson
ea281a54f3
include header with PyAST_Validate
2011-08-12 23:10:50 -05:00
Benjamin Peterson
f8e7543df9
merge 3.2 ( #12732 )
2011-08-12 22:18:19 -05:00
Benjamin Peterson
f413b80806
in narrow builds, make sure to test codepoints as identifier characters ( closes #12732 )
...
This fixes the use of Unicode identifiers outside the BMP in narrow builds.
2011-08-12 22:17:18 -05:00
Sandro Tosi
98d95a50c9
merge with 3.2
2011-08-13 00:40:08 +02:00
Sandro Tosi
7bf4363f77
let PySequence_Check me a link; thanks to tomo cocoa from docs@
2011-08-13 00:39:46 +02:00
Éric Araujo
147cd508bc
Merge 3.2
2011-08-12 19:53:13 +02:00
Éric Araujo
fdea624e61
Branch merge
2011-08-12 19:53:02 +02:00
Éric Araujo
c2d2c720d4
Branch merge
2011-08-12 19:52:43 +02:00
Éric Araujo
a7e33a10ae
Clean up test_shutil, to facilitate upcoming improvements ( #12721 ).
...
The tests now have two convenience functions to wrap os.path.join, open
and read or write instead of four or six slightly different functions.
The new functions accept a tuple of path segments but not a list
anymore, as it makes no sense to use a list here; I have also removed
the default value for the contents in write_file, as I find it better to
have the contents at the call site.
For simple open then read/write calls, I have left the usual idiom (with
open + read/write), as it is short and readable enough.
I’ve also changed some convoluted cleanup code to just use rmtree, and
removed dubious LBYL os.path.exists checks. The tests still pass on my
machine, and leave no file in $TMP. test_shutil is not as clean as it
could be, but I’ll stop here.
Initial patch provided by Hynek Schlawack, in preparation for a new
feature with new tests in #12715 .
2011-08-12 19:51:35 +02:00
Éric Araujo
1bf5b6a454
Update crlf and lfcr scripts for 3.x bytes semantics ( #12032 ).
...
Changes to crlf originally by Victor Stinner for 3.3, copied to lfcr by
me. Manually tested.
2011-08-12 19:40:05 +02:00
Sandro Tosi
b90770d31b
merge with 3.2
2011-08-12 19:31:56 +02:00
Sandro Tosi
8a3b657f9e
it's 'rather than'; reported by James Bateman on docs@
2011-08-12 19:31:32 +02:00
Éric Araujo
f04488e2ba
Merge 3.2
2011-08-12 18:03:30 +02:00
Éric Araujo
14eba5fa41
Brench merge
2011-08-12 17:59:25 +02:00
Éric Araujo
fbc5ff6235
patchcheck: don’t talk about the test suite when no code file were changed.
...
The line about the test suite will still get printed for changes in
Tools for example, which aren’t covered by the test suite, but it’s not
a big deal IMO.
2011-08-12 17:50:08 +02:00
Éric Araujo
28d39a0c08
Branch merge
2011-08-12 17:40:25 +02:00
Eli Bendersky
47fe5c0d51
Issue #12672 : fix code samples in extending/newtypes.html for PEP-7 compliance
2011-08-12 11:40:39 +03:00
Éric Araujo
4460abea64
Use our existing drop-in, no-op decorator instead of redefining it.
...
Patch by Francisco Martin Brugue.
2011-08-12 00:15:41 +02:00
Benjamin Peterson
ff3d3e4c7a
merge heads
2011-08-11 14:46:49 -05:00
Benjamin Peterson
b684702259
make only files which use AST depend on Python-ast.h
2011-08-11 14:46:26 -05:00
Benjamin Peterson
5a3f49bb7e
revert code which conditionally writes Python-ast.h ( closes #12727 )
2011-08-11 14:42:28 -05:00
Antoine Pitrou
fdf4a27422
Issue #12687 : Fix a possible buffering bug when unpickling text mode (protocol 0, mostly) pickles.
2011-08-11 21:15:53 +02:00
Antoine Pitrou
f6c7a8595e
Issue #12687 : Fix a possible buffering bug when unpickling text mode (protocol 0, mostly) pickles.
2011-08-11 21:04:02 +02:00
Brian Curtin
49281076c1
Add doc for Py_RETURN_NOTIMPLEMENTED, added in #12724 .
2011-08-11 09:41:31 -05:00
Vinay Sajip
f0dda5f876
Closes #12718 : Merge documentation fix from 3.2.
2011-08-11 13:46:54 +01:00
Vinay Sajip
817495a631
Issue #12718 : Add documentation on using custom importers.
2011-08-11 13:45:48 +01:00
Brian Curtin
c29966f392
merge
2011-08-10 20:34:20 -05:00
Brian Curtin
0275fc191c
News item for #12724
2011-08-10 20:32:10 -05:00
Brian Curtin
dfc80e3d97
Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED.
...
The macro was introduced in #12724 .
2011-08-10 20:28:54 -05:00
Senthil Kumaran
5b0a4d22c5
merge from 3.2
2011-08-11 09:25:45 +08:00
Senthil Kumaran
9dc4cad979
News item for Issue10087.
2011-08-11 09:24:37 +08:00
Senthil Kumaran
962fed9101
Fix closes Issue10087 - fixing the output of calendar display in the html format. Patch by Chris Lambacher. Test Contributed by catherine.
2011-08-11 09:22:52 +08:00
Brian Curtin
7d2f9e1342
Add Py_RETURN_NOTIMPLEMENTED macro. Fixes #12724 .
2011-08-10 20:05:21 -05:00
Éric Araujo
54dbfbd675
Fix directive markup
2011-08-10 21:43:13 +02:00
Éric Araujo
e9715b9001
Merge 3.2
2011-08-10 21:42:23 +02:00
Éric Araujo
cfcc9779fc
Remove unused names in except clauses
2011-08-10 20:54:33 +02:00
Éric Araujo
d9d7bca6da
Use real word in English text (i.e. not code)
2011-08-10 04:19:03 +02:00
Éric Araujo
25785e9ca5
Revert cosmetic change.
...
A reminder: distutils only gets bug fixes. Cosmetic changes, especially
in tests, are not worth the time spent, and can even make future merges
of bugfixes a bit less easy.
2011-08-10 02:46:33 +02:00
Éric Araujo
1c608e3847
Fix find command in makefile “funny” target
2011-08-10 02:01:32 +02:00
Benjamin Peterson
257a1d0f28
2.x syntax
2011-08-09 18:48:02 -05:00
Benjamin Peterson
4ec450d3c7
make this work on 2.4
2011-08-09 18:38:57 -05:00
Benjamin Peterson
6f7500424c
make this work with py2.5
2011-08-09 16:49:52 -05:00
Benjamin Peterson
a17a5d67b4
typo
2011-08-09 16:49:13 -05:00
Benjamin Peterson
398256b230
don't rewrite the header file if it hasn't changed; this reduces development build time
2011-08-09 16:28:58 -05:00