]> granicus.if.org Git - python/log
python
11 years agoIssue #13483: Use VirtualAlloc in obmalloc on Windows.
Martin v. Löwis [Thu, 27 Jun 2013 10:23:29 +0000 (12:23 +0200)]
Issue #13483: Use VirtualAlloc in obmalloc on Windows.

11 years agoMerge #18311: fix typo.
R David Murray [Wed, 26 Jun 2013 19:11:32 +0000 (15:11 -0400)]
Merge #18311: fix typo.

11 years ago#18311: fix typo.
R David Murray [Wed, 26 Jun 2013 19:11:12 +0000 (15:11 -0400)]
#18311: fix typo.

11 years ago#11454: Reduce email module load time, improve surrogate check efficiency.
R David Murray [Wed, 26 Jun 2013 16:06:21 +0000 (12:06 -0400)]
#11454: Reduce email module load time, improve surrogate check efficiency.

The new _has_surrogates code was suggested by Serhiy Storchaka.  See
the issue for timings, but it is far faster than any other alternative,
and also removes the load time that we previously incurred from compiling
the complex regex this replaces.

11 years agoFix os.confstr(): the result type of the C function is size_t, not int
Victor Stinner [Tue, 25 Jun 2013 21:13:47 +0000 (23:13 +0200)]
Fix os.confstr(): the result type of the C function is size_t, not int

11 years agoFix time.mktime() and datetime.datetime.timestamp() on AIX
Victor Stinner [Tue, 25 Jun 2013 20:54:35 +0000 (22:54 +0200)]
Fix time.mktime() and datetime.datetime.timestamp() on AIX

On AIX, the C function mktime() alwaysd sets tm_wday, even on error. So tm_wday
cannot be used as a sentinel to detect an error, we can only check if the
result is (time_t)-1.

11 years agotest_gdb.py: ignore also "warning: Source file is more recent than executable." pattern
Victor Stinner [Tue, 25 Jun 2013 19:54:32 +0000 (21:54 +0200)]
test_gdb.py: ignore also "warning: Source file is more recent than executable." pattern

11 years agoIssue #17206: Fix test_cmd_line and test_faulthandler for my previous change
Victor Stinner [Tue, 25 Jun 2013 19:54:17 +0000 (21:54 +0200)]
Issue #17206: Fix test_cmd_line and test_faulthandler for my previous change
(test.regrtest and test.script_helper enable faulthandler module in
subprocesses).

11 years agoIssue #17206: test.regrtest and test.script_helper enable faulthandler module
Victor Stinner [Tue, 25 Jun 2013 19:24:36 +0000 (21:24 +0200)]
Issue #17206: test.regrtest and test.script_helper enable faulthandler module
in subprocesses.

11 years ago#11390: fix test failures due to readline and windows lineneds.
R David Murray [Tue, 25 Jun 2013 12:11:22 +0000 (08:11 -0400)]
#11390: fix test failures due to readline and windows lineneds.

11 years agoIssue 18111: Add a default argument to min() and max()
Raymond Hettinger [Tue, 25 Jun 2013 05:43:02 +0000 (22:43 -0700)]
Issue 18111: Add a default argument to min() and max()

11 years ago(Merge 3.3) Fix time.strftime("%Y") on AIX: raise a ValueError for year > 9999
Victor Stinner [Tue, 25 Jun 2013 00:34:13 +0000 (02:34 +0200)]
(Merge 3.3) Fix time.strftime("%Y") on AIX: raise a ValueError for year > 9999

time.strtime("%Y") returned "2345" when formatting year 12345.

11 years agoFix time.strftime("%Y") on AIX: raise a ValueError for year > 9999
Victor Stinner [Tue, 25 Jun 2013 00:33:53 +0000 (02:33 +0200)]
Fix time.strftime("%Y") on AIX: raise a ValueError for year > 9999

time.strtime("%Y") returned "2345" when formatting year 12345.

11 years ago_ssl.c: strip trailing spaces
Victor Stinner [Mon, 24 Jun 2013 22:44:31 +0000 (00:44 +0200)]
_ssl.c: strip trailing spaces

11 years ago(Merge 3.3) Issue #18135: ssl.SSLSocket.write() now raises an OverflowError if
Victor Stinner [Mon, 24 Jun 2013 22:43:47 +0000 (00:43 +0200)]
(Merge 3.3) Issue #18135: ssl.SSLSocket.write() now raises an OverflowError if
the input string in longer than 2 gigabytes, and
ssl.SSLContext.load_cert_chain() raises a ValueError if the password is longer
than 2 gigabytes. The ssl module does not support partial write.

11 years agoIssue #18135: ssl.SSLSocket.write() now raises an OverflowError if the input
Victor Stinner [Mon, 24 Jun 2013 22:42:31 +0000 (00:42 +0200)]
Issue #18135: ssl.SSLSocket.write() now raises an OverflowError if the input
string in longer than 2 gigabytes, and ssl.SSLContext.load_cert_chain() raises
a ValueError if the password is longer than 2 gigabytes. The ssl module does
not support partial write.

11 years agoIf MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified.
Victor Stinner [Mon, 24 Jun 2013 22:37:25 +0000 (00:37 +0200)]
If MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified.

11 years agoIssue #18081: Workaround "./python -m test_idle test_logging" failure
Victor Stinner [Mon, 24 Jun 2013 22:17:37 +0000 (00:17 +0200)]
Issue #18081: Workaround "./python -m test_idle test_logging" failure

"import idlelib" should not install hooks on the warning modules, hooks should
only be installed when IDLE is started.

11 years agoIssue #9566: More long/Py_ssize_t fixes in tuple and list iterators (it_index)
Victor Stinner [Mon, 24 Jun 2013 21:59:24 +0000 (23:59 +0200)]
Issue #9566: More long/Py_ssize_t fixes in tuple and list iterators (it_index)

11 years agoIssue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods
Victor Stinner [Mon, 24 Jun 2013 21:47:41 +0000 (23:47 +0200)]
Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods
of socket.socket objects now truncate the input buffer to INT_MAX bytes on
Windows to avoid an integer overflow.

(sendall() still send the whole buffer.)

11 years agoIssue #9566: pystrtod.c: Fix a compiler warnings on Windows x64
Victor Stinner [Mon, 24 Jun 2013 21:37:40 +0000 (23:37 +0200)]
Issue #9566: pystrtod.c: Fix a compiler warnings on Windows x64

11 years agoIssue #9566: Fix a compiler warning on Windows x64
Victor Stinner [Mon, 24 Jun 2013 21:34:15 +0000 (23:34 +0200)]
Issue #9566: Fix a compiler warning on Windows x64

11 years agoIssue #9566: Fix a compiler warning in tupleiter_setstate() on Windows x64
Victor Stinner [Mon, 24 Jun 2013 21:31:48 +0000 (23:31 +0200)]
Issue #9566: Fix a compiler warning in tupleiter_setstate() on Windows x64

11 years agoIssue #18164: merge from 3.3
Ned Deily [Mon, 24 Jun 2013 21:23:35 +0000 (14:23 -0700)]
Issue #18164: merge from 3.3

11 years agoIssue #18164: Clarify the embedding docs regarding link options.
Ned Deily [Mon, 24 Jun 2013 21:22:09 +0000 (14:22 -0700)]
Issue #18164: Clarify the embedding docs regarding link options.

11 years agoIssue #9566: _winapi.WriteFile() now truncates length to DWORD_MAX (4294967295)
Victor Stinner [Mon, 24 Jun 2013 21:13:24 +0000 (23:13 +0200)]
Issue #9566: _winapi.WriteFile() now truncates length to DWORD_MAX (4294967295)

11 years agoIssue #9566: zlib: Explicit cast to unsigned int to fix a compiler warning on Windows x64
Victor Stinner [Mon, 24 Jun 2013 21:02:51 +0000 (23:02 +0200)]
Issue #9566: zlib: Explicit cast to unsigned int to fix a compiler warning on Windows x64

11 years agoIssue #9566: _io: Use Py_SAFE_DOWNCAST for fix a compiler warning on Windows x64
Victor Stinner [Mon, 24 Jun 2013 21:01:33 +0000 (23:01 +0200)]
Issue #9566: _io: Use Py_SAFE_DOWNCAST for fix a compiler warning on Windows x64

11 years agoMerge.
Richard Oudkerk [Mon, 24 Jun 2013 19:39:28 +0000 (20:39 +0100)]
Merge.

11 years agoFix typo.
Richard Oudkerk [Mon, 24 Jun 2013 19:38:46 +0000 (20:38 +0100)]
Fix typo.

11 years agoMerge.
Richard Oudkerk [Mon, 24 Jun 2013 17:13:54 +0000 (18:13 +0100)]
Merge.

11 years agoClarify note and fix typo.
Richard Oudkerk [Mon, 24 Jun 2013 17:12:57 +0000 (18:12 +0100)]
Clarify note and fix typo.

11 years agoIssue #15818: Merge.
Richard Oudkerk [Mon, 24 Jun 2013 14:43:35 +0000 (15:43 +0100)]
Issue #15818: Merge.

11 years agoIssue #15818: Typo in docs.
Richard Oudkerk [Mon, 24 Jun 2013 14:42:00 +0000 (15:42 +0100)]
Issue #15818: Typo in docs.

11 years agoIssue #18277: Merge.
Richard Oudkerk [Mon, 24 Jun 2013 13:52:14 +0000 (14:52 +0100)]
Issue #18277: Merge.

11 years agoIssue #18277: Document quirks of multiprocessing queue.
Richard Oudkerk [Mon, 24 Jun 2013 13:48:07 +0000 (14:48 +0100)]
Issue #18277: Document quirks of multiprocessing queue.

11 years agoFix test for GCC 3.1+ but not strict ANSI C
Christian Heimes [Mon, 24 Jun 2013 13:39:58 +0000 (15:39 +0200)]
Fix test for GCC 3.1+ but not strict ANSI C

11 years agoFix test for GCC 3.1+ but not strict ANSI C
Christian Heimes [Mon, 24 Jun 2013 13:39:41 +0000 (15:39 +0200)]
Fix test for GCC 3.1+ but not strict ANSI C

11 years agomerge
Raymond Hettinger [Sun, 23 Jun 2013 22:47:03 +0000 (15:47 -0700)]
merge

11 years agoMisc improvements to collections.deque()
Raymond Hettinger [Sun, 23 Jun 2013 22:44:33 +0000 (15:44 -0700)]
Misc improvements to collections.deque()

* Clarified comment on the impact of BLOCKLEN on deque_index
  (with a power-of-two, the division and modulo
   computations are done with a right-shift and bitwise-and).

* Clarified comment on the overflow check to note that
  it is general and not just applicable the 64-bit builds.

* In deque._rotate(), the "deque->" indirections are
  factored-out of the loop (loop invariant code motion),
  leaving the code cleaner looking and slightly faster.

* In deque._rotate(), replaced the memcpy() with an
  equivalent loop.  That saved the memcpy setup time
  and allowed the pointers to move in their natural
  leftward and rightward directions.

See comparative timings at:  http://pastebin.com/p0RJnT5N

11 years agoIssue #11016: Don't define macros and constants that are already set by pyport.h
Christian Heimes [Sun, 23 Jun 2013 22:13:14 +0000 (00:13 +0200)]
Issue #11016: Don't define macros and constants that are already set by pyport.h

11 years agoDefine S_IFMT and S_IFLNK in pyport.h so posixmodule.c can use named constants instead
Christian Heimes [Sun, 23 Jun 2013 21:56:05 +0000 (23:56 +0200)]
Define S_IFMT and S_IFLNK in pyport.h so posixmodule.c can use named constants instead
of arbitrary looking numbers.

11 years agoCheck for correct macro, code uses S_ISDIR().
Christian Heimes [Sun, 23 Jun 2013 21:52:40 +0000 (23:52 +0200)]
Check for correct macro, code uses S_ISDIR().

11 years agoCheck for correct macro, code uses S_ISDIR().
Christian Heimes [Sun, 23 Jun 2013 21:51:44 +0000 (23:51 +0200)]
Check for correct macro, code uses S_ISDIR().

11 years agoIssue #11016: Detect integer conversion on conversion from Python int to C mode_t
Victor Stinner [Sun, 23 Jun 2013 20:57:43 +0000 (22:57 +0200)]
Issue #11016: Detect integer conversion on conversion from Python int to C mode_t

11 years agomerge
Christian Heimes [Sun, 23 Jun 2013 20:57:22 +0000 (22:57 +0200)]
merge

11 years agoFix a typo in S_ISDIR, S_ISCHR, S_ISBLK and S_ISREG.
Christian Heimes [Sun, 23 Jun 2013 20:57:02 +0000 (22:57 +0200)]
Fix a typo in S_ISDIR, S_ISCHR, S_ISBLK and S_ISREG.
Add extra braces to S_IS*() macros

11 years agoMerge #18179: reflow paragraphs.
R David Murray [Sun, 23 Jun 2013 20:06:13 +0000 (16:06 -0400)]
Merge #18179: reflow paragraphs.

11 years ago#18179: reflow paragraphs.
R David Murray [Sun, 23 Jun 2013 20:05:44 +0000 (16:05 -0400)]
#18179: reflow paragraphs.

11 years agoMerge #18179: document the local_hostname parameter.
R David Murray [Sun, 23 Jun 2013 19:52:08 +0000 (15:52 -0400)]
Merge #18179: document the local_hostname parameter.

Original patch by Berker Peksag.

11 years ago#18179: document the local_hostname parameter.
R David Murray [Sun, 23 Jun 2013 19:47:50 +0000 (15:47 -0400)]
#18179: document the local_hostname parameter.

Original patch by Berker Peksag.

11 years ago#11390: convert doctest CLI to argparse and add -o and -f options.
R David Murray [Sun, 23 Jun 2013 18:24:13 +0000 (14:24 -0400)]
#11390: convert doctest CLI to argparse and add -o and -f options.

This provides a way to specify arbitrary doctest options when using
the CLI interface to process test files, just as one can when calling
testmod or testfile programmatically.

11 years agoMerge heads
Serhiy Storchaka [Sun, 23 Jun 2013 17:27:40 +0000 (20:27 +0300)]
Merge heads

11 years agoMerge heads
Serhiy Storchaka [Sun, 23 Jun 2013 17:25:57 +0000 (20:25 +0300)]
Merge heads

11 years agoMerge heads
Serhiy Storchaka [Sun, 23 Jun 2013 17:25:40 +0000 (20:25 +0300)]
Merge heads

11 years agoIssue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
Serhiy Storchaka [Sun, 23 Jun 2013 17:21:16 +0000 (20:21 +0300)]
Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
OverflowError when an argument of %c format is out of range.

11 years agoIssue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
Serhiy Storchaka [Sun, 23 Jun 2013 17:12:14 +0000 (20:12 +0300)]
Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
OverflowError when an argument of %c format is out of range.

11 years agoMerged fix for issue #18260 from 3.3
Łukasz Langa [Sun, 23 Jun 2013 17:12:12 +0000 (19:12 +0200)]
Merged fix for issue #18260 from 3.3

11 years agoFixed issue #18260: configparser TypeError on source name specified as bytes
Łukasz Langa [Sun, 23 Jun 2013 17:10:25 +0000 (19:10 +0200)]
Fixed issue #18260: configparser TypeError on source name specified as bytes

11 years agoSolaris' /dev/null is a symlink. The device test now uses stat instead of lstat to...
Christian Heimes [Sun, 23 Jun 2013 14:11:37 +0000 (16:11 +0200)]
Solaris' /dev/null is a symlink. The device test now uses stat instead of lstat to compensate
for symlinks.

11 years agoSolaris' /dev/null is a symlink. The device test now uses stat instead of lstat to...
Christian Heimes [Sun, 23 Jun 2013 14:10:29 +0000 (16:10 +0200)]
Solaris' /dev/null is a symlink. The device test now uses stat instead of lstat to compensate
for symlinks.

11 years agoimport.c does neither need mode_t nor _mkdir() anymore
Christian Heimes [Sun, 23 Jun 2013 13:53:09 +0000 (15:53 +0200)]
import.c does neither need mode_t nor _mkdir() anymore

11 years agoAdd _stat module to VS project file -- this time with the GUI instead of manually.
Christian Heimes [Sun, 23 Jun 2013 13:50:45 +0000 (15:50 +0200)]
Add _stat module to VS project file -- this time with the GUI instead of manually.

11 years agoadd _stat to list of builtin Windows modules
Christian Heimes [Sun, 23 Jun 2013 13:46:56 +0000 (15:46 +0200)]
add _stat to list of builtin Windows modules

11 years ago(Merge 3.3) Issue #18135: Fix a possible integer overflow in
Victor Stinner [Sun, 23 Jun 2013 13:09:26 +0000 (15:09 +0200)]
(Merge 3.3) Issue #18135: Fix a possible integer overflow in
ssl.SSLSocket.write() and in ssl.SSLContext.load_cert_chain() for strings and
passwords longer than 2 gigabytes.

11 years agoIssue #18135: Fix a possible integer overflow in ssl.SSLSocket.write()
Victor Stinner [Sun, 23 Jun 2013 13:08:23 +0000 (15:08 +0200)]
Issue #18135: Fix a possible integer overflow in ssl.SSLSocket.write()
and in ssl.SSLContext.load_cert_chain() for strings and passwords longer
than 2 gigabytes.

11 years ago_ssl.c: strip trailing spaces
Victor Stinner [Sun, 23 Jun 2013 12:58:43 +0000 (14:58 +0200)]
_ssl.c: strip trailing spaces

11 years ago(Merge 3.3) Issue #18137: Detect integer overflow on precision in
Victor Stinner [Sun, 23 Jun 2013 12:55:43 +0000 (14:55 +0200)]
(Merge 3.3) Issue #18137: Detect integer overflow on precision in
float.__format__() and complex.__format__().

11 years agoIssue #18137: Detect integer overflow on precision in float.__format__() and
Victor Stinner [Sun, 23 Jun 2013 12:54:30 +0000 (14:54 +0200)]
Issue #18137: Detect integer overflow on precision in float.__format__() and
complex.__format__().

11 years agoIssue #11016: Try to fix compilaton of the new _stat.c module on Windows
Victor Stinner [Sat, 22 Jun 2013 23:49:42 +0000 (01:49 +0200)]
Issue #11016: Try to fix compilaton of the new _stat.c module on Windows

11 years agoMerge from 3.3
Andrew Kuchling [Sat, 22 Jun 2013 23:27:59 +0000 (19:27 -0400)]
Merge from 3.3

11 years agoCloses #18220: expand itertools.islice docstring to 2 lines
Andrew Kuchling [Sat, 22 Jun 2013 23:20:54 +0000 (19:20 -0400)]
Closes #18220: expand itertools.islice docstring to 2 lines

11 years agoClose #18285: add 'repeat' parameter to docstring for product
Andrew Kuchling [Sat, 22 Jun 2013 23:04:11 +0000 (19:04 -0400)]
Close #18285: add 'repeat' parameter to docstring for product

11 years ago#18151 Merge from 3.3
Terry Jan Reedy [Sat, 22 Jun 2013 22:37:34 +0000 (18:37 -0400)]
#18151 Merge from 3.3

11 years ago#18151, part 2: Silence debug build resource warning for each file opened by
Terry Jan Reedy [Sat, 22 Jun 2013 22:26:51 +0000 (18:26 -0400)]
#18151, part 2: Silence debug build resource warning for each file opened by
'Find in files' by replacing 'open with implicit close' by 'with open' in
GrepDialog method grep_it. Streamline code with enumerate(), direct file
iteration, and output tweak. Add test for this method, including output format.

11 years agoIssue #11016: Add C implementation of the stat module as _stat
Christian Heimes [Sat, 22 Jun 2013 19:05:02 +0000 (21:05 +0200)]
Issue #11016: Add C implementation of the stat module as _stat

11 years agoMerge from 3.3
Andrew Kuchling [Sat, 22 Jun 2013 18:57:45 +0000 (14:57 -0400)]
Merge from 3.3

11 years ago#18113: avoid segfault if Py_XDECREF triggers code that calls set_panel_userptr again
Andrew Kuchling [Sat, 22 Jun 2013 18:50:56 +0000 (14:50 -0400)]
#18113: avoid segfault if Py_XDECREF triggers code that calls set_panel_userptr again

Problem noted & original patch by Serhiy Storchaka; I tweaked the patch a bit.

11 years ago... also TLSv1.1 and TLSv1.2
Christian Heimes [Sat, 22 Jun 2013 17:34:17 +0000 (19:34 +0200)]
... also TLSv1.1 and TLSv1.2

11 years agoAdd my SSL module patches to whatsnew 3.4
Christian Heimes [Sat, 22 Jun 2013 17:31:58 +0000 (19:31 +0200)]
Add my SSL module patches to whatsnew 3.4

11 years agoBSD: block devices are gone
Christian Heimes [Sat, 22 Jun 2013 12:48:42 +0000 (14:48 +0200)]
BSD: block devices are gone
http://www.freebsd.org/doc/en/books/arch-handbook/driverbasics-block.html

11 years agoBSD: block devices are gone
Christian Heimes [Sat, 22 Jun 2013 12:48:32 +0000 (14:48 +0200)]
BSD: block devices are gone
http://www.freebsd.org/doc/en/books/arch-handbook/driverbasics-block.html

11 years agomerge for issue #18278
Brett Cannon [Fri, 21 Jun 2013 22:37:02 +0000 (18:37 -0400)]
merge for issue #18278

11 years agoIssue #18278: properly document how the loaders are called for FileFinder
Brett Cannon [Fri, 21 Jun 2013 22:31:55 +0000 (18:31 -0400)]
Issue #18278: properly document how the loaders are called for FileFinder

11 years agomarshal: optimize parsing of empty Unicode strings
Victor Stinner [Fri, 21 Jun 2013 17:08:06 +0000 (19:08 +0200)]
marshal: optimize parsing of empty Unicode strings

Don't create a temporary buffer of zeroy byte nor call r_string() if the length
is zero, create directly the empty string.

11 years agoFix test_stat on BSD, /dev/da0 and /dev/ad0 are links
Christian Heimes [Fri, 21 Jun 2013 16:53:27 +0000 (18:53 +0200)]
Fix test_stat on BSD, /dev/da0 and /dev/ad0 are links

11 years agoFix test_stat on BSD, /dev/da0 and /dev/ad0 are links
Christian Heimes [Fri, 21 Jun 2013 16:53:13 +0000 (18:53 +0200)]
Fix test_stat on BSD, /dev/da0 and /dev/ad0 are links

11 years agoAdd tests for untested features of the 'stat' module (part of issue #11016)
Christian Heimes [Fri, 21 Jun 2013 16:26:05 +0000 (18:26 +0200)]
Add tests for untested features of the 'stat' module (part of issue #11016)

11 years agoAdd tests for untested features of the 'stat' module (part of issue #11016)
Christian Heimes [Fri, 21 Jun 2013 16:25:56 +0000 (18:25 +0200)]
Add tests for untested features of the 'stat' module (part of issue #11016)

11 years ago#12716: reorganize docs for os module a bit
Andrew Kuchling [Fri, 21 Jun 2013 15:49:57 +0000 (11:49 -0400)]
#12716: reorganize docs for os module a bit

* Move the constants used by os.open() to after the description of os.open(),
  instead of putting them in their own section.

* Move RTLD_* constants to "Miscellaneous System Information" section, and
  mention the sys functions they're used with.

* Mention dir_fd parameter in os.open() text.

* Typo fix ("are a supported by").

11 years ago#13226: update references from ctypes/DLFCN modules to os module
Andrew Kuchling [Fri, 21 Jun 2013 14:58:41 +0000 (10:58 -0400)]
#13226: update references from ctypes/DLFCN modules to os module

11 years agoMerge from 3.3
Andrew Kuchling [Fri, 21 Jun 2013 12:07:35 +0000 (08:07 -0400)]
Merge from 3.3

11 years agoCloses #18218: use correct variable name for starting point
Andrew Kuchling [Fri, 21 Jun 2013 12:00:58 +0000 (08:00 -0400)]
Closes #18218: use correct variable name for starting point

11 years agoCloses #18239: correct description of count() in module docstring
Andrew Kuchling [Fri, 21 Jun 2013 11:58:35 +0000 (07:58 -0400)]
Closes #18239: correct description of count() in module docstring

11 years agoCloses #18247: add Lib/test/data/* to .gitignore
Andrew Kuchling [Fri, 21 Jun 2013 11:44:50 +0000 (07:44 -0400)]
Closes #18247: add Lib/test/data/* to .gitignore

11 years agoMerge from 3.3
Andrew Kuchling [Fri, 21 Jun 2013 01:40:14 +0000 (21:40 -0400)]
Merge from 3.3

11 years agoCloses #18267: use floor division in code example
Andrew Kuchling [Fri, 21 Jun 2013 01:33:05 +0000 (21:33 -0400)]
Closes #18267: use floor division in code example

11 years agoGrammatical mistake in a comment
Brett Cannon [Fri, 21 Jun 2013 01:30:32 +0000 (21:30 -0400)]
Grammatical mistake in a comment

11 years agoMerge from 3.3
Andrew Kuchling [Fri, 21 Jun 2013 01:20:20 +0000 (21:20 -0400)]
Merge from 3.3

11 years agoCloses #18272: use 'builtins' for 3.3 instead of __builtin__
Andrew Kuchling [Fri, 21 Jun 2013 01:17:41 +0000 (21:17 -0400)]
Closes #18272: use 'builtins' for 3.3 instead of __builtin__