Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Issue #10576: Add a progress callback to gcmodule | Kristján Valur Jónsson | 2012-04-15 | 4 | -9/+249 |
| | |||||
* | Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows. | Kristján Valur Jónsson | 2012-04-15 | 4 | -26/+26 |
|\ | |||||
| * | Make all socket related modules link with ws2_32.lib on windows, like | Kristján Valur Jónsson | 2012-04-15 | 4 | -26/+26 |
| | | | | | | | | _socket does. Some were using the older wsock32.lib. | ||||
* | | Merge with remote. | Ross Lagerwall | 2012-04-15 | 1 | -4/+5 |
|\ \ | |||||
| * | | Be less verbose when building dbm. | Ross Lagerwall | 2012-04-15 | 1 | -4/+5 |
| | | | |||||
* | | | Plug a refleak. | Brett Cannon | 2012-04-15 | 1 | -2/+1 |
|/ / | |||||
* | | Clarify that one should not use __import__() directly. Also mention | Brett Cannon | 2012-04-15 | 1 | -3/+5 |
| | | | | | | | | PEP 328 in explaining how 'index' works. | ||||
* | | Handle importing pkg.mod by executing | Brett Cannon | 2012-04-15 | 4 | -253/+276 |
| | | | | | | | | | | __import__('mod', {'__packaging__': 'pkg', level=1) w/o properly (and thus not segfaulting). | ||||
* | | Rebuild importlib.h to incorporate added comments. | Brett Cannon | 2012-04-15 | 1 | -30/+30 |
| | | |||||
* | | IDLE was relying on implicit relative imports which have gone away in | Brett Cannon | 2012-04-15 | 1 | -3/+7 |
| | | | | | | | | | | Python 3.3 thanks to importlib finishing the work in PEP 328 that accidently got carried forward. | ||||
* | | Add some comments. | Brett Cannon | 2012-04-14 | 1 | -0/+2 |
| | | |||||
* | | merge with the tip | Brian Curtin | 2012-04-14 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix an import race condition. | Brett Cannon | 2012-04-14 | 1 | -2/+2 |
| | | | |||||
* | | | Fix Windows build | Brian Curtin | 2012-04-14 | 1 | -3/+4 |
|/ / | |||||
* | | Try to fix a sporadic test failure from what is probably a caching race ↵ | Brett Cannon | 2012-04-14 | 1 | -0/+1 |
| | | | | | | | | condition. | ||||
* | | Undo a C99 idiom. | Brett Cannon | 2012-04-14 | 1 | -2/+2 |
| | | |||||
* | | Issue #2377: Make importlib the implementation of __import__(). | Brett Cannon | 2012-04-14 | 38 | -599/+3597 |
| | | | | | | | | | | | | | | importlib._bootstrap is now frozen into Python/importlib.h and stored as _frozen_importlib in sys.modules. Py_Initialize() loads the frozen code along with sys and imp and then uses _frozen_importlib._install() to set builtins.__import__() w/ _frozen_importlib.__import__(). | ||||
* | | merge with 3.2 | Sandro Tosi | 2012-04-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | fix typo; thanks to Jérôme Mainka from docs@ | Sandro Tosi | 2012-04-14 | 1 | -1/+1 |
| | | |||||
* | | Merge highlight and spacing fixes in json example with 3.2. | Ezio Melotti | 2012-04-14 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Fix highlight and spacing in json example. | Ezio Melotti | 2012-04-14 | 1 | -4/+4 |
| | | |||||
* | | #14535: merge with 3.2. | Ezio Melotti | 2012-04-14 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | #14535: fix code highlight in multiprocessing examples. Patch by Tshepang ↵ | Ezio Melotti | 2012-04-14 | 1 | -1/+4 |
| | | | | | | | | Lekhonkhobe. | ||||
* | | Merge #14399: corrected news item | R David Murray | 2012-04-14 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | #14399: corrected news item | R David Murray | 2012-04-14 | 1 | -4/+4 |
| | | |||||
* | | merge 3.2 | Benjamin Peterson | 2012-04-13 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | move outside WITH_THREAD conditional | Benjamin Peterson | 2012-04-13 | 1 | -2/+2 |
| | | |||||
* | | Fix clock_gettime/getres/settime: PyArg_ParseTuple() expects an int | Victor Stinner | 2012-04-13 | 1 | -10/+4 |
| | | | | | | | | Only use a single #ifdef for the 3 functions. | ||||
* | | Minor docstring / docs corrections for unittest.mock | Michael Foord | 2012-04-13 | 3 | -11/+11 |
| | | |||||
* | | Make unittest.mock.create_autospec resilient against AttributeError on ↵ | Michael Foord | 2012-04-13 | 2 | -2/+29 |
| | | | | | | | | original object | ||||
* | | merge 3.2 | Benjamin Peterson | 2012-04-13 | 1 | -4/+3 |
|\ \ | |/ | |||||
| * | take linkage def outside of WITH_THREAD conditional (closes #14569) | Benjamin Peterson | 2012-04-13 | 1 | -4/+3 |
| | | |||||
| * | merge heads | Amaury Forgeot d'Arc | 2012-04-13 | 3 | -0/+11 |
| |\ | |||||
| * | | #14399: zipfile now correctly handles comments added to empty zipfiles. | R David Murray | 2012-04-12 | 4 | -11/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | Patch by Serhiy Storchaka. This also moves the TypeError that results from trying to use a unicode comment from the 'close' step to the point at which the comment is added to the zipfile. | ||||
* | | | unittest.mock.PropertyMock return value and attributes are now standard ↵ | Michael Foord | 2012-04-13 | 3 | -0/+25 |
| | | | | | | | | | | | | MagicMocks | ||||
* | | | put PyImportErrorObject with its brothers | Benjamin Peterson | 2012-04-13 | 1 | -7/+7 |
| | | | |||||
* | | | Merge | Brett Cannon | 2012-04-13 | 3 | -0/+11 |
|\ \ \ | |||||
| * \ \ | merge heads | Amaury Forgeot d'Arc | 2012-04-13 | 3 | -0/+11 |
| |\ \ \ | |||||
| | * \ \ | Merge heads | Amaury Forgeot d'Arc | 2012-04-13 | 3 | -11/+49 |
| | |\ \ \ | |||||
| | * \ \ \ | hg merge 3.2 | Amaury Forgeot d'Arc | 2012-04-13 | 3 | -0/+11 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Issue14559: Fix build files old Microft compilers. | Amaury Forgeot d'Arc | 2012-04-13 | 3 | -0/+11 |
| | | | |/ | | | |/| | | | | | | | | | | | With VS8.0 at least Python compiles and works correctly. | ||||
* | | | | | NEWS entry about importlib and ImportError's new attributes. | Brett Cannon | 2012-04-13 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Have importlib take advantage of ImportError's new 'name' and 'path' | Brett Cannon | 2012-04-13 | 9 | -41/+76 |
|/ / / / | | | | | | | | | | | | | attributes. | ||||
* | | | | Issue #1559549: Add 'name' and 'path' attributes to ImportError. | Brett Cannon | 2012-04-13 | 6 | -3/+192 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | Currently import does not use these attributes as they are planned for use by importlib (which will be another commit). Thanks to Filip Gruszczyński for the initial patch and Brian Curtin for refining it. | ||||
* | | | Merge #14399: zipfile now correctly handles comments added to empty zipfiles. | R David Murray | 2012-04-12 | 3 | -11/+49 |
|/ / | | | | | | | | | | | | | | | Patch by Serhiy Storchaka. This also moves the TypeError that results from trying to use a unicode comment from the 'close' step to the point at which the comment is added to the zipfile. | ||||
* | | Doc: sort time.CLOCK_xxx constants | Victor Stinner | 2012-04-12 | 1 | -8/+8 |
| | | |||||
* | | Null-merge 3.2 branch. | Georg Brandl | 2012-04-12 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | 3.2 sidebar: link to 3.3, not 3.1 | Georg Brandl | 2012-04-12 | 1 | -1/+1 |
| | | |||||
* | | Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. | Charles-François Natali | 2012-04-12 | 3 | -0/+7 |
|\ \ | |/ | |||||
| * | Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. | Charles-François Natali | 2012-04-12 | 3 | -0/+7 |
| | |