Benjamin Peterson
7d8d9a588c
Merged revisions 66797 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001 : fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532 . Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 21:04:36 +00:00
Georg Brandl
b76a2b1305
#4029 : fix typo.
2008-10-04 18:37:20 +00:00
Georg Brandl
0df797943c
#4000 : fix several 2.x atavisms.
2008-10-04 18:33:26 +00:00
Amaury Forgeot d'Arc
b186f34384
Issue3187 for Macintosh platform:
...
macpath.py now accepts both unicode string and bytes as file names.
Also add more tests for these functions.
Reviewed by Benjamin.
2008-10-03 21:57:20 +00:00
Benjamin Peterson
f60fe81030
Blocked revisions 66714,66721,66763-66765 via svnmerge
...
........
r66714 | barry.warsaw | 2008-10-01 16:46:40 -0500 (Wed, 01 Oct 2008) | 2 lines
Bumping to 2.6 final.
........
r66721 | barry.warsaw | 2008-10-01 22:33:51 -0500 (Wed, 01 Oct 2008) | 1 line
Bump to 2.7a0
........
r66763 | neal.norwitz | 2008-10-02 23:13:08 -0500 (Thu, 02 Oct 2008) | 1 line
Update the version to 2.7. Hopefully this fixes the test_distutils failure
........
r66764 | martin.v.loewis | 2008-10-03 03:59:41 -0500 (Fri, 03 Oct 2008) | 2 lines
Bump version to 2.7. Regenerate.
........
r66765 | martin.v.loewis | 2008-10-03 05:59:55 -0500 (Fri, 03 Oct 2008) | 1 line
Update version number to 2.7.
........
2008-10-03 21:35:48 +00:00
Amaury Forgeot d'Arc
3b44e6114e
Issue3187 again: test_ntpath failed when run with the -bb option
...
(BytesWarning: Comparison between bytes and string)
2008-10-03 20:32:33 +00:00
Amaury Forgeot d'Arc
84e1715dd7
Make the test more robust in face of remaining files.
2008-10-03 19:34:30 +00:00
Amaury Forgeot d'Arc
c72ef8b6df
Second part of #3187 , for windows:
...
os and os.path functions now accept both unicode and byte strings for file names.
Reviewed by Guido.
2008-10-03 18:38:26 +00:00
Guido van Rossum
3f2291f802
Change fnmatch.py to use separate caches for str and bytes keys.
...
This is necessary to pass the tests with -bb.
2008-10-03 16:38:30 +00:00
Hirokazu Yamamoto
7ed519603f
Blocked revisions 66768 via svnmerge
...
........
r66768 | hirokazu.yamamoto | 2008-10-04 01:07:28 +0900 | 1 line
Follows to python's version change (VC6)
........
2008-10-03 16:16:20 +00:00
Martin v. Löwis
04dc25c537
Issue #3187 : Add sys.setfilesystemencoding.
2008-10-03 16:09:28 +00:00
Benjamin Peterson
efb14a8857
update pydoc-topics
2008-10-02 21:02:27 +00:00
Benjamin Peterson
0fe89a0b60
Blocked revisions 66756 via svnmerge
...
........
r66756 | benjamin.peterson | 2008-10-02 15:46:58 -0500 (Thu, 02 Oct 2008) | 1 line
update pydoc topics
........
2008-10-02 20:52:36 +00:00
Martin v. Löwis
5771c55366
Add UUID for 3.0b4.
2008-10-02 20:10:40 +00:00
Martin v. Löwis
fc972498d7
Add UUID for 3.1.
2008-10-02 20:09:47 +00:00
Martin v. Löwis
7a63fc4d21
Merged revisions 66752 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66752 | martin.v.loewis | 2008-10-02 22:04:47 +0200 (Do, 02 Okt 2008) | 2 lines
Add UUID for 2.7.
........
2008-10-02 20:09:01 +00:00
Christian Heimes
1a8501c648
Merged revisions 66748 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66748 | christian.heimes | 2008-10-02 21:47:50 +0200 (Thu, 02 Oct 2008) | 1 line
Fixed a couple more C99 comments and one occurence of inline.
........
+ another // comment in bytesobject
2008-10-02 19:56:01 +00:00
Benjamin Peterson
c472532c0c
Blocked revisions 66744 via svnmerge
...
........
r66744 | benjamin.peterson | 2008-10-02 14:00:31 -0500 (Thu, 02 Oct 2008) | 1 line
we're in 2.7 now
........
2008-10-02 19:10:18 +00:00
Guido van Rossum
f0af3e30db
Issue #3187 : Better support for "undecodable" filenames. Code by Victor
...
Stinner, with small tweaks by GvR.
2008-10-02 18:55:37 +00:00
Christian Heimes
fefeca53ee
Merged revisions 66739 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66739 | christian.heimes | 2008-10-02 20:33:41 +0200 (Thu, 02 Oct 2008) | 1 line
Fixed a comment to C89 style as of http://drj11.wordpress.com/2008/10/02/python-and-bragging-about-c89/
........
2008-10-02 18:38:11 +00:00
Guido van Rossum
ecc3336f44
Fix svn:ignore properties on these two directories.
2008-10-02 16:57:05 +00:00
Martin v. Löwis
f7cef62419
Merged revisions 66722 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66722 | martin.v.loewis | 2008-10-02 13:44:17 +0200 (Do, 02 Okt 2008) | 1 line
Use CRT 9 policy files.
........
2008-10-02 11:46:09 +00:00
Martin v. Löwis
fe21884a60
Merged revisions 66710 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66710 | martin.v.loewis | 2008-10-01 13:19:50 +0200 (Mi, 01 Okt 2008) | 2 lines
Bug #3989 : Package the 2to3 script (as 2to3.py) in the Windows
installer.
........
2008-10-01 11:22:32 +00:00
Amaury Forgeot d'Arc
58fb905ad0
Fix a probable merge glitch in r66695:
...
a redundant check that actually belongs to another function.
2008-09-30 20:22:44 +00:00
Benjamin Peterson
c9e435ee2b
check for errors after PyLong_Ssize_t
...
patch from Victor Stinner #3977
reviewed by Amaury
2008-09-30 02:22:04 +00:00
Benjamin Peterson
a8a93042dc
Merged revisions 66693 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66693 | benjamin.peterson | 2008-09-29 21:11:07 -0500 (Mon, 29 Sep 2008) | 4 lines
Victor Stinner's patches to check the return result of PyLong_Ssize_t
reviewed by Amaury
........
2008-09-30 02:18:09 +00:00
Benjamin Peterson
cb9a5517d0
remove a trace of the cmp argument for list.sort
2008-09-30 02:08:36 +00:00
Benjamin Peterson
05c262171f
Blocked revisions 66676,66682,66689 via svnmerge
...
........
r66676 | jesus.cea | 2008-09-28 18:24:19 -0500 (Sun, 28 Sep 2008) | 1 line
bsddb4.7.3pre9 renamed to 4.7.3
........
r66682 | bill.janssen | 2008-09-29 13:56:38 -0500 (Mon, 29 Sep 2008) | 1 line
fix for release blocker 3910, 2.6 regression in socket.ssl method
........
r66689 | benjamin.peterson | 2008-09-29 20:31:49 -0500 (Mon, 29 Sep 2008) | 5 lines
fix security issue 2: imageop's poor validation of arguments could result in segfaults
patch by Victor Stinner
reviewed by myself and Brett
........
2008-09-30 01:53:10 +00:00
Martin v. Löwis
601149bb8e
Merged revisions 66686 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66686 | martin.v.loewis | 2008-09-30 00:09:07 +0200 (Di, 30 Sep 2008) | 5 lines
Issue #3965 : Allow repeated calls to turtle.Screen, by making it a
true singleton object.
Reviewed by Gregor Lingl.
........
2008-09-29 22:19:08 +00:00
Thomas Heller
28acc6cae5
Merged revisions 66683 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66683 | thomas.heller | 2008-09-29 21:56:24 +0200 (Mo, 29 Sep 2008) | 1 line
Fix issue #3547 for MingW, update comments.
........
2008-09-29 20:03:53 +00:00
Georg Brandl
4970215bb5
#3993 : fix old-style print statements.
2008-09-29 06:43:45 +00:00
Brett Cannon
58e74c6e0a
Blocked revisions 66677 via svnmerge.
...
Should be merged once test_cProfile is no longer flagged as broken.
........
r66677 | brett.cannon | 2008-09-28 20:41:21 -0700 (Sun, 28 Sep 2008) | 7 lines
The _lsprof module could crash the interpreter if it was given an external
timer that did not return a float and a timer was still running when the
Profiler object was garbage collected.
Fixes issue 3895.
Code review by Benjamin Peterson.
........
2008-09-29 04:05:23 +00:00
Benjamin Peterson
d06e3b00e9
Merged revisions 66673 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66673 | benjamin.peterson | 2008-09-28 15:57:21 -0500 (Sun, 28 Sep 2008) | 1 line
merge in the fix for test_ftplib on some bots [reviewed by Georg]
........
2008-09-28 21:00:42 +00:00
Georg Brandl
89f09a687e
#3983 : typo fix.
2008-09-28 09:08:27 +00:00
Georg Brandl
850c5cd9cb
Merged revisions 66667 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66667 | georg.brandl | 2008-09-28 10:34:31 +0200 (Sun, 28 Sep 2008) | 2 lines
No downloads for RCs.
........
2008-09-28 08:38:49 +00:00
Benjamin Peterson
e9bbc8b257
Devil merge!
...
Merged revisions 66561,66564,66580,66610,66614,66618,66624-66625,66628-66629,66643,66645,66660-66665 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66561 | benjamin.peterson | 2008-09-22 17:13:29 -0500 (Mon, 22 Sep 2008) | 1 line
clean up docs for platform's linux_distribution and dist functions
........
r66564 | benjamin.peterson | 2008-09-23 08:32:46 -0500 (Tue, 23 Sep 2008) | 1 line
mention how to override boolean evaluation
........
r66580 | georg.brandl | 2008-09-24 04:47:55 -0500 (Wed, 24 Sep 2008) | 2 lines
Indentation normalization.
........
r66610 | andrew.kuchling | 2008-09-24 12:27:55 -0500 (Wed, 24 Sep 2008) | 1 line
Improve wording
........
r66614 | benjamin.peterson | 2008-09-24 17:11:59 -0500 (Wed, 24 Sep 2008) | 4 lines
#3950 fix missing scale factors in turtle.py
reviewers: Georg, Benjamin
........
r66618 | benjamin.peterson | 2008-09-25 15:35:45 -0500 (Thu, 25 Sep 2008) | 1 line
add a NEWs entry for r66614
........
r66624 | raymond.hettinger | 2008-09-25 18:31:52 -0500 (Thu, 25 Sep 2008) | 1 line
Fix namedtuple bug reported by Glenn Linderman. Template did not form correctly if the field names were input in Unicode.
........
r66625 | benjamin.peterson | 2008-09-25 21:58:36 -0500 (Thu, 25 Sep 2008) | 1 line
add the beginnings of a C-API 2 -> 3 porting guide
........
r66628 | benjamin.peterson | 2008-09-26 15:52:06 -0500 (Fri, 26 Sep 2008) | 1 line
add an 'other options' section
........
r66629 | georg.brandl | 2008-09-26 16:15:21 -0500 (Fri, 26 Sep 2008) | 2 lines
typos.
........
r66643 | andrew.kuchling | 2008-09-27 09:12:33 -0500 (Sat, 27 Sep 2008) | 1 line
Add a last bunch of items
........
r66645 | benjamin.peterson | 2008-09-27 11:23:55 -0500 (Sat, 27 Sep 2008) | 1 line
2to3's api should be considered unstable
........
r66660 | andrew.kuchling | 2008-09-27 17:54:08 -0500 (Sat, 27 Sep 2008) | 1 line
#3510 : future-proof text
........
r66661 | benjamin.peterson | 2008-09-27 18:28:43 -0500 (Sat, 27 Sep 2008) | 1 line
clarify a few things
........
r66662 | andrew.kuchling | 2008-09-27 19:15:27 -0500 (Sat, 27 Sep 2008) | 1 line
#1579477 : mention necessity to flush output before exec'ing
........
r66663 | andrew.kuchling | 2008-09-27 20:08:47 -0500 (Sat, 27 Sep 2008) | 1 line
#1415508 : Document two functions
........
r66664 | benjamin.peterson | 2008-09-27 20:51:36 -0500 (Sat, 27 Sep 2008) | 1 line
better grammar
........
r66665 | benjamin.peterson | 2008-09-27 20:53:29 -0500 (Sat, 27 Sep 2008) | 1 line
note the 2to3 -d could be useful for other refactoring
........
2008-09-28 02:06:32 +00:00
Benjamin Peterson
d61de7f18d
Merged revisions 66653-66654 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66653 | benjamin.peterson | 2008-09-27 16:09:10 -0500 (Sat, 27 Sep 2008) | 49 lines
Merged revisions 66511,66548-66549,66644,66646-66652 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66511 | benjamin.peterson | 2008-09-18 21:49:27 -0500 (Thu, 18 Sep 2008) | 1 line
remove a useless if __name__ == '__main__'
........
r66548 | benjamin.peterson | 2008-09-21 21:14:14 -0500 (Sun, 21 Sep 2008) | 1 line
avoid the perils of mutable default arguments
........
r66549 | benjamin.peterson | 2008-09-21 21:26:11 -0500 (Sun, 21 Sep 2008) | 1 line
some places in RefactoringTool should raise an error instead of logging it
........
r66644 | benjamin.peterson | 2008-09-27 10:45:10 -0500 (Sat, 27 Sep 2008) | 1 line
fix doctest refactoring
........
r66646 | benjamin.peterson | 2008-09-27 11:40:13 -0500 (Sat, 27 Sep 2008) | 1 line
don't print to stdout when 2to3 is used as a library
........
r66647 | benjamin.peterson | 2008-09-27 12:28:28 -0500 (Sat, 27 Sep 2008) | 1 line
let fixer modules and classes have different prefixes
........
r66648 | benjamin.peterson | 2008-09-27 14:02:13 -0500 (Sat, 27 Sep 2008) | 1 line
raise errors when 2to3 is used as a library
........
r66649 | benjamin.peterson | 2008-09-27 14:03:38 -0500 (Sat, 27 Sep 2008) | 1 line
fix docstring
........
r66650 | benjamin.peterson | 2008-09-27 14:22:21 -0500 (Sat, 27 Sep 2008) | 1 line
make use of enumerate
........
r66651 | benjamin.peterson | 2008-09-27 14:24:13 -0500 (Sat, 27 Sep 2008) | 1 line
revert last revision; it breaks things
........
r66652 | benjamin.peterson | 2008-09-27 16:03:06 -0500 (Sat, 27 Sep 2008) | 1 line
add tests for lib2to3.refactor
........
................
r66654 | benjamin.peterson | 2008-09-27 16:12:20 -0500 (Sat, 27 Sep 2008) | 1 line
enable refactor tests
................
2008-09-27 22:17:35 +00:00
Benjamin Peterson
027951f16d
Blocked revisions 66657 via svnmerge
...
........
r66657 | benjamin.peterson | 2008-09-27 17:08:12 -0500 (Sat, 27 Sep 2008) | 1 line
backport r66656 so people using -Qnew aren't affected
........
2008-09-27 22:10:28 +00:00
Benjamin Peterson
3a53fbbfcf
#3911 FTP.makeport was giving bad port numbers
...
reviewed by Benjamin and Antoine
2008-09-27 22:04:16 +00:00
Benjamin Peterson
be17a11721
Merged revisions 66634 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66634 | benjamin.peterson | 2008-09-26 21:49:54 -0500 (Fri, 26 Sep 2008) | 7 lines
give ftplib a real test suite
A asyncore based mock ftp server is used to test the protocol.
This is all thanks to Giampaolo Rodola #3939
(Barry gave me permission to do this before final on IRC.)
........
2008-09-27 21:49:47 +00:00
Amaury Forgeot d'Arc
f2e9368021
Merged revisions 66631 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66631 | amaury.forgeotdarc | 2008-09-27 00:34:08 +0200 (sam., 27 sept. 2008) | 7 lines
#3967 : Correct a crash in count() and find() methods of string-like objects.
For example:
"".count("xxxx", sys.maxint, 0)
Reviewed by Benjamin Peterson.
Will port to 2.5 and 3.0.
........
2008-09-26 22:48:41 +00:00
Benjamin Peterson
60320cb3e4
#3946 fix PyObject_CheckBuffer on a memoryview object
...
reviewed by Antoine
2008-09-26 21:49:22 +00:00
Amaury Forgeot d'Arc
8a1b689e85
Blocked revisions 66568 via svnmerge
...
........
r66568 | jesus.cea | 2008-09-23 20:54:08 +0200 (mar., 23 sept. 2008) | 1 line
Bugfix for issue3885 and 'DB.verify()' crash
........
2008-09-25 22:55:06 +00:00
Amaury Forgeot d'Arc
b5cf301b8e
#3929 : dbm.open() would try to raise a tuple. This does not work anymore with python 3.0.
...
Reviewed by Georg Brandl.
2008-09-25 22:27:43 +00:00
Amaury Forgeot d'Arc
7de5f29972
Blocked revisions 66620 via svnmerge
...
........
r66620 | amaury.forgeotdarc | 2008-09-25 22:52:56 +0200 (jeu., 25 sept. 2008) | 5 lines
#3965 : on Windows, open() crashes if the filename or the mode is invalid,
and if the filename is a unicode string.
Reviewed by Martin von Loewis.
........
2008-09-25 20:57:46 +00:00
Martin v. Löwis
6fea2339d8
Merged revisions 66616 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66616 | martin.v.loewis | 2008-09-25 06:12:50 +0200 (Do, 25 Sep 2008) | 2 lines
Bug #3951 : Py_USING_MEMORY_DEBUGGER should not be enabled by default.
........
2008-09-25 04:15:27 +00:00
Benjamin Peterson
78cb491de3
Merged revisions 66496 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66496 | benjamin.peterson | 2008-09-17 20:22:16 -0500 (Wed, 17 Sep 2008) | 1 line
fix possible integer overflows in _hashopenssl #3886
........
2008-09-24 22:53:33 +00:00
Thomas Heller
1308c26cf4
Merged revisions 66611 via svnmerge from
...
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66611 | thomas.heller | 2008-09-24 20:26:05 +0200 (Mi, 24 Sep 2008) | 3 lines
Fix issue #3547 : ctypes is confused by bitfields of varying integer types
Reviewed by Fredrik Lundh and Skip Montanaro.
........
2008-09-24 19:01:29 +00:00
Georg Brandl
05f5ab7ee3
Remove references to __cmp__.
2008-09-24 09:11:47 +00:00
Benjamin Peterson
23dbc6eeca
Blocked revisions 66569 via svnmerge
...
........
r66569 | benjamin.peterson | 2008-09-23 15:43:09 -0500 (Tue, 23 Sep 2008) | 1 line
backport the atexit test for r66563
........
2008-09-23 20:53:33 +00:00