Victor Stinner
0c2dd0c0a9
Close #17702 : On error, os.environb now removes suppress the except context
...
when raising a new KeyError with the original key.
2013-08-23 19:19:15 +02:00
Brett Cannon
330cc52c99
Delete merge markers
2013-08-23 12:10:09 -04:00
Brett Cannon
e2f6b799b8
merge for issue #18755
2013-08-23 11:52:44 -04:00
Brett Cannon
16ababc213
merge for issue #18755
2013-08-23 11:52:19 -04:00
Brett Cannon
f1e0273023
NEW entry for issue #18755
2013-08-23 11:47:26 -04:00
Brett Cannon
a4975a911d
Issue #18755 : Allow imp.load_*() loaders to have get_data() called
...
multiple times.
2013-08-23 11:45:57 -04:00
Brett Cannon
f9f0458961
merge emphasized discouragement of overriding __import__
2013-08-23 11:00:04 -04:00
Brett Cannon
f5ebd26403
Emphasize that people should not override __import__.
...
With importlib getting used more and more, changing __import__ will
not work as well as people used to hope as it will potentially bypass
importers, etc. It also will not work with importlib.import_module()
as it uses "importlib.__import__" (i.e. importlib's implementation of
import) directly and not builtins.__import__.
2013-08-23 10:58:49 -04:00
Raymond Hettinger
bfc1e1a9cd
Add the same dummy type that is used in dictionaries.
2013-08-23 03:22:15 -05:00
Tim Peters
a1db94554b
Add line explaining the "%sort" test.
2013-08-22 18:42:02 -05:00
Tim Peters
01e75a699d
Add line explaining the "%sort" test.
...
(grafted from 1ea833ecaf5a9d43a886e9e73b4e2551d0d5b548)
2013-08-22 18:32:53 -05:00
Richard Oudkerk
67e5198dbf
Make test for semaphore tracker capture and check the debug output.
2013-08-22 23:37:23 +01:00
Raymond Hettinger
fcf3b500ba
Issue 18797: Remove unneeded refcount adjustments for dummy objects.
...
It suffices to keep just one reference when the object is created.
2013-08-22 08:20:31 -07:00
Serhiy Storchaka
e39e54d0b3
Issue #16809 : Fixed some tkinter incompabilities with Tcl/Tk 8.6.
2013-08-22 17:53:06 +03:00
Serhiy Storchaka
06ce077e43
Issue #16809 : Fixed some tkinter incompabilities with Tcl/Tk 8.6.
2013-08-22 17:51:58 +03:00
Serhiy Storchaka
254954aacd
Issue #16809 : Tkinter's splitlist() and split() methods now accept Tcl_Obj
...
argument.
This is needed for support Tcl/Tk 8.6.
2013-08-22 17:42:05 +03:00
Serhiy Storchaka
203eb317d2
Issue #16809 : Tkinter's splitlist() and split() methods now accept Tcl_Obj
...
argument.
This is needed for support Tcl/Tk 8.6.
2013-08-22 17:40:31 +03:00
Richard Oudkerk
a93bf7b9a6
Fix devpoll_dealloc().
2013-08-22 14:03:44 +01:00
Richard Oudkerk
168d59b669
Move definition of devpoll_internal_close() before devpoll_close().
2013-08-22 13:31:15 +01:00
Richard Oudkerk
069d65c35a
Fix compilation of select module on Solaris.
2013-08-22 13:04:23 +01:00
Christian Heimes
50f6e71fed
Issue #18747 : Update Misc/NEWS to reflect the latest changeset.
2013-08-22 13:22:46 +02:00
Christian Heimes
1852b30c50
Issue #18747 : Update Misc/NEWS to reflect the latest changeset.
2013-08-22 13:22:37 +02:00
Christian Heimes
f54c24628b
Issue #18747 : Use a parent atfork handler instead of a child atfork handler.
...
fork() is suppose to be async-signal safe but the handler calls unsafe functions. A parent handler mitigates the issue.
2013-08-22 13:19:56 +02:00
Christian Heimes
80c5de93f9
Issue #18747 : Use a parent atfork handler instead of a child atfork handler.
...
fork() is suppose to be async-signal safe but the handler calls unsafe functions. A parent handler mitigates the issue.
2013-08-22 13:19:48 +02:00
Richard Oudkerk
7d2d43c0b1
Stop making fork server have copy of semaphore_tracker_fd.
2013-08-22 11:38:57 +01:00
Richard Oudkerk
0718f70131
Issue #18762 : Fix EBADF error when using forkserver.
2013-08-22 11:38:55 +01:00
R David Murray
b8c537094d
Merge #18324 : set_payload now correctly handles binary input.
2013-08-21 21:13:51 -04:00
R David Murray
00ae435dee
#18324 : set_payload now correctly handles binary input.
...
This also backs out the previous fixes for for #14360 , #1717 , and #16564 .
Those bugs were actually caused by the fact that set_payload didn't decode to
str, thus rendering the model inconsistent. This fix does mean the data
processed by the encoder functions goes through an extra encode/decode cycle,
but it means the model is always consistent. Future API updates will provide
a better way to encode payloads, which will bypass this minor de-optimization.
Tests by Vajrasky Kok.
2013-08-21 21:10:31 -04:00
Victor Stinner
cba2e3c2e9
remove unused declaration
2013-08-22 02:23:13 +02:00
Victor Stinner
82fb71d662
Cleanup test_builtin
2013-08-22 01:58:12 +02:00
Victor Stinner
0f24b879c9
Use new new stat.S_ISDOOR() function, instead of hardcoded mask
2013-08-22 01:58:04 +02:00
Tim Peters
e0bb0c9c14
Merge 3.3 into default.
...
The only file change is adding the v3.2.5 tag to the .hgtags file.
2013-08-21 18:55:56 -05:00
Tim Peters
0b169125ca
Merge 3.2 into 3.3.
...
The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.
2013-08-21 18:52:57 -05:00
Antoine Pitrou
665ad902e9
Null merge
2013-08-22 00:48:49 +02:00
Antoine Pitrou
1e440cf5a2
Issue #18792 : Use "127.0.0.1" or "::1" instead of "localhost" as much as possible, since "localhost" goes through a DNS lookup under recent Windows versions.
2013-08-22 00:39:46 +02:00
Antoine Pitrou
f6fbf56071
Issue #18792 : Use "127.0.0.1" or "::1" instead of "localhost" as much as possible, since "localhost" goes through a DNS lookup under recent Windows versions.
2013-08-22 00:39:46 +02:00
Victor Stinner
13423c3726
Close #18794 : Add a fileno() method and a closed attribute to select.devpoll
...
objects.
Add also tests on fileno() method and closed attribute of select.epoll and select.kqueue.
2013-08-22 00:19:50 +02:00
Serhiy Storchaka
43f80e6c1f
Merge heads
2013-08-21 21:52:50 +03:00
Richard Oudkerk
a01fb39877
Issue #18762 : Print debug info on failure to create new forkserver process.
...
Also modify test code to hopefully avoid deadlock on failure.
2013-08-21 19:45:19 +01:00
Serhiy Storchaka
4e4088d273
Issue #17119 : Fixed integer overflows when processing large strings and tuples
...
in the tkinter module.
2013-08-21 21:43:08 +03:00
Serhiy Storchaka
9e6b97502f
Issue #17119 : Fixed integer overflows when processing large strings and tuples
...
in the tkinter module.
2013-08-21 21:38:21 +03:00
Christian Heimes
6acbe2aaa3
Issue #18747 : Re-seed OpenSSL's pseudo-random number generator after fork.
...
A pthread_atfork() child handler is used to seeded the PRNG with pid, time
and some stack data.
2013-08-21 13:26:34 +02:00
Christian Heimes
f77b4b20e9
Issue #18747 : Re-seed OpenSSL's pseudo-random number generator after fork.
...
A pthread_atfork() child handler is used to seeded the PRNG with pid, time
and some stack data.
2013-08-21 13:26:05 +02:00
Raymond Hettinger
5bb1b1dd6f
Hoist the global dummy lookup out of the inner loop for set_merge().
2013-08-21 01:34:18 -07:00
Raymond Hettinger
929cbac307
Remove a redundant hash table probe (this was artifact from an earlier draft of the patch).
2013-08-20 23:03:28 -07:00
Raymond Hettinger
ae9e616a00
Issue 18772: Restore set dummy object back to unicode and restore the identity checks in lookkey().
...
The Gdb prettyprint plugin depended on the dummy object being displayable.
Other solutions besides a unicode object are possible. For now, get it
back up and running.
The identity checks in lookkey() need to be there to prevent the dummy
object from leaking through Py_RichCompareBool() into user code in the
rare circumstance where the dummy's hash value exactly matches the hash
value of the actual key being looked up.
2013-08-20 22:28:24 -07:00
Christian Heimes
0688897f05
Fix rev85282, add missing import of subprocess module
2013-08-20 22:09:41 +02:00
Serhiy Storchaka
5617df1be6
Issue #8865 : Concurrent invocation of select.poll.poll() now raises a
...
RuntimeError exception. Patch by Christian Schubert.
2013-08-20 20:50:32 +03:00
Serhiy Storchaka
b1973c252c
Issue #8865 : Concurrent invocation of select.poll.poll() now raises a
...
RuntimeError exception. Patch by Christian Schubert.
2013-08-20 20:38:21 +03:00
Serhiy Storchaka
edd0de58a8
Issue #13461 : Fix a crash in the TextIOWrapper.tell method on 64-bit platforms.
...
Patch by Yogesh Chaudhari.
2013-08-20 20:07:50 +03:00