Mailman 3 February 2015 - Python-checkins

cpython (3.4): Fix copy/paste error in bytes.isupper() doc.
by zach.ware Feb. 27, 2015

Feb. 27, 2015

https://hg.python.org/cpython/rev/d0e15d9cdd4b changeset: 94769:d0e15d9cdd4b branch: 3.4 parent: 94765:ed27f53137ad user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Feb 27 01:40:22 2015 -0600 summary: Fix copy/paste error in bytes.isupper() doc. Reported by Jon Colburn on docs@. files: Doc/library/stdtypes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2880,8 +2880,8 @@ .. method:: bytes.isupper() bytearray.isupper() - Return true if there is at least one lowercase alphabetic ASCII character - in the sequence and no uppercase ASCII characters, false otherwise. + Return true if there is at least one uppercase alphabetic ASCII character + in the sequence and no lowercase ASCII characters, false otherwise. For example:: -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Bump the blocksize up from 62 to 64 to speed up the modulo calculation.
by raymond.hettinger Feb. 27, 2015

Feb. 27, 2015

https://hg.python.org/cpython/rev/430cab0c5cbf changeset: 94768:430cab0c5cbf user: Raymond Hettinger <python(a)rcn.com> date: Thu Feb 26 23:21:29 2015 -0800 summary: Bump the blocksize up from 62 to 64 to speed up the modulo calculation. Remove the old comment suggesting that it was desireable to have blocksize+2 as a multiple of the cache line length. That would have made sense only if the block structure start point was always aligned to a cache line boundary. However, the memory allocations are 16 byte aligned, so we don't really have control over whether the struct spills across cache line boundaries. files: Lib/test/test_deque.py | 2 +- Modules/_collectionsmodule.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -542,7 +542,7 @@ @support.cpython_only def test_sizeof(self): - BLOCKLEN = 62 + BLOCKLEN = 64 basesize = support.calcobjsize('2P4nlP') blocksize = struct.calcsize('2P%dP' % BLOCKLEN) self.assertEqual(object.__sizeof__(deque()), basesize) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -10,14 +10,11 @@ /* The block length may be set to any number over 1. Larger numbers * reduce the number of calls to the memory allocator, give faster * indexing and rotation, and reduce the link::data overhead ratio. - * - * Ideally, the block length will be set to two less than some - * multiple of the cache-line length (so that the full block - * including the leftlink and rightlink will fit neatly into - * cache lines). + * Making the block length a power of two speeds-up the modulo + * calculation in deque_item(). */ -#define BLOCKLEN 62 +#define BLOCKLEN 64 #define CENTER ((BLOCKLEN - 1) / 2) /* A `dequeobject` is composed of a doubly-linked list of `block` nodes. -- Repository URL: https://hg.python.org/cpython

1 0

cpython: unix newlines
by benjamin.peterson Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/cpython/rev/dc55b5ce6b26 changeset: 94767:dc55b5ce6b26 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Feb 26 22:50:43 2015 -0500 summary: unix newlines files: .hgtags | 292 ++++++++++++++++++++++---------------------- 1 files changed, 146 insertions(+), 146 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -1,147 +1,147 @@ -64cc5439e10a6fdf984effaf0141e94fa4cc1004 v0.9.8 -78a7ed6953025e7ecdde9585099b01a6ae40b76a v0.9.9 -b15b8cc9b8d10e0352a0b8b7e8d51fa309db6df3 v1.0.1 -0326b5d61445ee3a8d3de28119f9652cb72d2e3f v1.0.2 -832615ec07646e310c85316b8ba6bc9b17ad3547 v1.1 -9895475d18c7b5f32adaf78f71886ae041e4d10c v1.1.1 -16eb4c51ee97169046340998e850a63c65225b0a v1.2b1 -b45c688756d04fb84d4a0d518fc3d7e3cb25fa8d v1.2b2 -9e82daf7605bad7976a9abc997cb5e0abe434078 v1.2b3 -065e31cf5862e27521cf5725b003aed211f091b2 v1.2b4 -e72257e655454d569468da8b1189e0ec336f3536 v1.2 -e63d83f8275853aaaa3d1972cb86564505e65583 v1.3b1 -7d743c865a9aa6bde8b603e32e0542031bba3c33 v1.3 -4fc85c82cc222554ae6b9c0b87776ed5f2b70c6e v1.4b1 -129f1299d4e97e884bbbbdd00baf101d178973e6 v1.4b2 -44a82ac654a4175569deed8e8a94b0cc8edee08d v1.4b3 -db49494c93dc73de06d5721c74eab533a947a92c v1.4 -062aed8a4ce2c91c81b80e29f02faff1cf5a761b v1.5a1 -c9498ac988372575cf7028b86395b900c9b0a840 v1.5a2 -dc5c968ec992aab3d40a7189df0c443d1c7a1a68 v1.5a3 -746654a0af680c7d9b814b210a026eb91bec9533 v1.5a4 -8ff58b5730f06be08fbbdc2bf592226f7a736201 v1.5b1 -eb78658d819fb0af09a8e6f9bedcb670805ed5f6 v1.5b2 -84461011a1a0ab402e352f06748f29fb5b5559e5 v1.5 -44aba4d26b01fbae0403efe654f9fd0347606732 v1.5.1 -fed63ccbe6dc3ac663bfe97a2f7006b1b28568f9 v1.5.2a1 -21d71f2e27248a0f4e393d0fc321ecf9b89321d2 v1.5.2a2 -f08c7a2a56f80741f5f192fd0ebe0b0967a203cf v1.5.2b1 -8fe7ec4b4fc1518fcac89e6bf674fbbce16150a9 v1.5.2b2 -39fb0dcc83dc375c1565ba65dbce0ed59b1359c9 v1.5.2c1 -61c91c7f101bab3149adfcd5646ae40e048de712 v1.5.2 -605eb9326ffe1fd1e43f40e2338d6652ab449fdf v1.6a1 -011bee8fd9f7f4da457ec71596484fb0882c0614 v1.6a2 -35c4fc1414a59888614b9be784a25f233ba67984 v2.0b1 -55bba197d4870cdae62aeca00e20240a756b84f8 v2.0b2 -e276329cce036a5f9e9d3451256dca5984e543dc v2.0c1 -2fa4e35083e02342ca014bf5bfba46aecb816c31 v2.0 -b60831eeab5a06dd3c5e8297a99e39297aa8794b v2.1a1 -b382f1f07ec6b2c95551658b30c6139eeb32077a v2.1a2 -d0c830db5e68edd4aaa3401216e610c9ff145826 v2.1b1 -b59a536ae1ef3774fd85c17f623e8926b7b6c095 v2.1b2 -d611276e9ad53b5d32d1e8065e1d811c32f7d96f v2.1c1 -ff065e674af6c9ab895bd9eff7d9e9039a376c7d v2.1c2 -020e95d8180d7943fe54701e1db0a7d7d87e2b1e v2.1 -08796a137f1ada2462f7a3177306df5f67a767e1 v2.2a3 -d054c29647f90bccb8345bd779bca1eecf2dd7f2 v2.3c1 -fce5c9e9abc722394cb2e909b7e2a39080d4448e v2.3c2 -92ca658fd420095b6284c9ce6e9082a80285ec9c v2.4a1 -055fc6955f3c6522bfeb7ed4c671c97d5baaaac2 v2.4a2 -186b72550e53533ef6175f6411f932c1298193d7 v2.4a3 -53cff04283855adf88ed0c0fd3698827ca843637 v2.4b1 -7e387a9dcc79954a77695adef8b593da35be1214 v2.4b2 -ff80d8bbef6e13426c8a85d7f9d837b8f8f89834 v2.4c1 -f31e18d313c7a4fc66914b2d27e130a0f72c0b69 v2.4 -cd3f783cd08a16781e236c0b9cb5717d1d995fa9 v3.0a1 -65e82140e281bf26f2e22eda05a7f9956c420f8b v3.0a2 -df15827f34881b9af0936350813ced5c123c8230 v3.0a3 -15f773f7300e372c56a21d59fe49ca26955a6477 v3.0a4 -e35935475153377d6727d64e6c52f72c3b84015b v3.0a5 -a335c4d643b1cfe14197a9ef195c9b2804f608fc v3.0b1 -16ec4bb14a68ea428acf09ebf0c92981da2646f3 v3.0b2 -509e30a7968e01be329ec121540b3e755fc4e566 v3.0b3 -507ede9c7f7f475dfafbd4a52c22d767d10a2bc0 v3.0rc1 -8fae465a39627b590385462e6095eb63af45240a v3.0rc2 -e83a60c69d53f5551a306e77a6d38e9b11485496 v3.0rc3 -bc1ce368986e45b1faf96f93995df46bcd75e7b8 v3.1a1 -ee430e5075db2adf8124e6b94916a89ca41d3171 v3.1a2 -b63020797f9678adaf4d2c3e26574a9eef2ef028 v3.1b1 -4353fd0843cb31b356adc50f93d220e2e7255ef2 v3.1rc1 -0b87e438e1b53e3f812cad963a7fdb65d198ba2f v3.1rc2 -a69a031ac1402dede8b1ef80096436bca6d371f3 v3.1 -35efb1054ec6ceca72017a587263cb6a9257340b v3.1.1rc1 -8b9c0f573ab29c41c6c5fdcca82a1fe0ff5355af v3.1.1 -149b8b87514d10416b598884db5f74651f625b38 v3.1.2rc1 -960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2 -d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1 -a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3 -32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1 -c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4 -ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1 -75db2bc69fc9a3e4801e94e3e19801cb096208d8 v3.1.5rc2 -7395330e495ec3316862ca1f6ce0aaf7bdf6785b v3.1.5 -b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1 -56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2 -da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3 -d92a5b850f5e56808bedc01723906ed64c5e6e2e v3.2a4 -b635cea94195780c8716e236479af319bcc26253 v3.2b1 -e3af5f3a7904c0d5343ec9633ea66e7acfd23a66 v3.2b2 -865d5b24bf28ca41b536befc326407c03e74a4d5 v3.2rc1 -acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2 -18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3 -a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2 -8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1 -cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1 -5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2 -ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1 -c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 -137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2 -7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 -428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 -3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 -b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1 -1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4 -cef745775b6583446572cffad704100983db2bea v3.2.5 -51382a5598ec96119cb84594572901c9c964dc3c v3.2.6rc1 -0bd5f4f14de965ca8e44c6e3965fee106176cfc4 v3.2.6 -f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 -2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2 -0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3 -7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4 -e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1 -4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2 -8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1 -88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2 -c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3 -bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0 -92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1 -d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1 -d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2 -fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1 -d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2 -c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3 -fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1 -7ff62415e4263c432c8acf6e424224209211eadb v3.3.4 -9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1 -ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2 -62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5 -51317c9786f54267975abf2e9c502e6aaaa4a249 v3.3.6rc1 -971fec30da1fc5bf2b9fb28e09812a5127014211 v3.3.6 -46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1 -9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2 -dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3 -e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4 -3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1 -ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2 -a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3 -5e088cea8660677969113741c1313d570d977e02 v3.4.0rc1 -a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2 -8a81cdab3e9d521daaef989fade94b16455fc3b8 v3.4.0rc3 -04f714765c13824c3bc2835d7b008908862e083a v3.4.0 -c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1 -c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1 -8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1 -ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 -69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 +64cc5439e10a6fdf984effaf0141e94fa4cc1004 v0.9.8 +78a7ed6953025e7ecdde9585099b01a6ae40b76a v0.9.9 +b15b8cc9b8d10e0352a0b8b7e8d51fa309db6df3 v1.0.1 +0326b5d61445ee3a8d3de28119f9652cb72d2e3f v1.0.2 +832615ec07646e310c85316b8ba6bc9b17ad3547 v1.1 +9895475d18c7b5f32adaf78f71886ae041e4d10c v1.1.1 +16eb4c51ee97169046340998e850a63c65225b0a v1.2b1 +b45c688756d04fb84d4a0d518fc3d7e3cb25fa8d v1.2b2 +9e82daf7605bad7976a9abc997cb5e0abe434078 v1.2b3 +065e31cf5862e27521cf5725b003aed211f091b2 v1.2b4 +e72257e655454d569468da8b1189e0ec336f3536 v1.2 +e63d83f8275853aaaa3d1972cb86564505e65583 v1.3b1 +7d743c865a9aa6bde8b603e32e0542031bba3c33 v1.3 +4fc85c82cc222554ae6b9c0b87776ed5f2b70c6e v1.4b1 +129f1299d4e97e884bbbbdd00baf101d178973e6 v1.4b2 +44a82ac654a4175569deed8e8a94b0cc8edee08d v1.4b3 +db49494c93dc73de06d5721c74eab533a947a92c v1.4 +062aed8a4ce2c91c81b80e29f02faff1cf5a761b v1.5a1 +c9498ac988372575cf7028b86395b900c9b0a840 v1.5a2 +dc5c968ec992aab3d40a7189df0c443d1c7a1a68 v1.5a3 +746654a0af680c7d9b814b210a026eb91bec9533 v1.5a4 +8ff58b5730f06be08fbbdc2bf592226f7a736201 v1.5b1 +eb78658d819fb0af09a8e6f9bedcb670805ed5f6 v1.5b2 +84461011a1a0ab402e352f06748f29fb5b5559e5 v1.5 +44aba4d26b01fbae0403efe654f9fd0347606732 v1.5.1 +fed63ccbe6dc3ac663bfe97a2f7006b1b28568f9 v1.5.2a1 +21d71f2e27248a0f4e393d0fc321ecf9b89321d2 v1.5.2a2 +f08c7a2a56f80741f5f192fd0ebe0b0967a203cf v1.5.2b1 +8fe7ec4b4fc1518fcac89e6bf674fbbce16150a9 v1.5.2b2 +39fb0dcc83dc375c1565ba65dbce0ed59b1359c9 v1.5.2c1 +61c91c7f101bab3149adfcd5646ae40e048de712 v1.5.2 +605eb9326ffe1fd1e43f40e2338d6652ab449fdf v1.6a1 +011bee8fd9f7f4da457ec71596484fb0882c0614 v1.6a2 +35c4fc1414a59888614b9be784a25f233ba67984 v2.0b1 +55bba197d4870cdae62aeca00e20240a756b84f8 v2.0b2 +e276329cce036a5f9e9d3451256dca5984e543dc v2.0c1 +2fa4e35083e02342ca014bf5bfba46aecb816c31 v2.0 +b60831eeab5a06dd3c5e8297a99e39297aa8794b v2.1a1 +b382f1f07ec6b2c95551658b30c6139eeb32077a v2.1a2 +d0c830db5e68edd4aaa3401216e610c9ff145826 v2.1b1 +b59a536ae1ef3774fd85c17f623e8926b7b6c095 v2.1b2 +d611276e9ad53b5d32d1e8065e1d811c32f7d96f v2.1c1 +ff065e674af6c9ab895bd9eff7d9e9039a376c7d v2.1c2 +020e95d8180d7943fe54701e1db0a7d7d87e2b1e v2.1 +08796a137f1ada2462f7a3177306df5f67a767e1 v2.2a3 +d054c29647f90bccb8345bd779bca1eecf2dd7f2 v2.3c1 +fce5c9e9abc722394cb2e909b7e2a39080d4448e v2.3c2 +92ca658fd420095b6284c9ce6e9082a80285ec9c v2.4a1 +055fc6955f3c6522bfeb7ed4c671c97d5baaaac2 v2.4a2 +186b72550e53533ef6175f6411f932c1298193d7 v2.4a3 +53cff04283855adf88ed0c0fd3698827ca843637 v2.4b1 +7e387a9dcc79954a77695adef8b593da35be1214 v2.4b2 +ff80d8bbef6e13426c8a85d7f9d837b8f8f89834 v2.4c1 +f31e18d313c7a4fc66914b2d27e130a0f72c0b69 v2.4 +cd3f783cd08a16781e236c0b9cb5717d1d995fa9 v3.0a1 +65e82140e281bf26f2e22eda05a7f9956c420f8b v3.0a2 +df15827f34881b9af0936350813ced5c123c8230 v3.0a3 +15f773f7300e372c56a21d59fe49ca26955a6477 v3.0a4 +e35935475153377d6727d64e6c52f72c3b84015b v3.0a5 +a335c4d643b1cfe14197a9ef195c9b2804f608fc v3.0b1 +16ec4bb14a68ea428acf09ebf0c92981da2646f3 v3.0b2 +509e30a7968e01be329ec121540b3e755fc4e566 v3.0b3 +507ede9c7f7f475dfafbd4a52c22d767d10a2bc0 v3.0rc1 +8fae465a39627b590385462e6095eb63af45240a v3.0rc2 +e83a60c69d53f5551a306e77a6d38e9b11485496 v3.0rc3 +bc1ce368986e45b1faf96f93995df46bcd75e7b8 v3.1a1 +ee430e5075db2adf8124e6b94916a89ca41d3171 v3.1a2 +b63020797f9678adaf4d2c3e26574a9eef2ef028 v3.1b1 +4353fd0843cb31b356adc50f93d220e2e7255ef2 v3.1rc1 +0b87e438e1b53e3f812cad963a7fdb65d198ba2f v3.1rc2 +a69a031ac1402dede8b1ef80096436bca6d371f3 v3.1 +35efb1054ec6ceca72017a587263cb6a9257340b v3.1.1rc1 +8b9c0f573ab29c41c6c5fdcca82a1fe0ff5355af v3.1.1 +149b8b87514d10416b598884db5f74651f625b38 v3.1.2rc1 +960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2 +d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1 +a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3 +32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1 +c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4 +ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1 +75db2bc69fc9a3e4801e94e3e19801cb096208d8 v3.1.5rc2 +7395330e495ec3316862ca1f6ce0aaf7bdf6785b v3.1.5 +b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1 +56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2 +da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3 +d92a5b850f5e56808bedc01723906ed64c5e6e2e v3.2a4 +b635cea94195780c8716e236479af319bcc26253 v3.2b1 +e3af5f3a7904c0d5343ec9633ea66e7acfd23a66 v3.2b2 +865d5b24bf28ca41b536befc326407c03e74a4d5 v3.2rc1 +acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2 +18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3 +a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2 +8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1 +cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1 +5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2 +ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1 +c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 +137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2 +7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 +428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 +3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 +b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1 +1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4 +cef745775b6583446572cffad704100983db2bea v3.2.5 +51382a5598ec96119cb84594572901c9c964dc3c v3.2.6rc1 +0bd5f4f14de965ca8e44c6e3965fee106176cfc4 v3.2.6 +f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 +2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2 +0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3 +7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4 +e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1 +4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2 +8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1 +88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2 +c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3 +bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0 +92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1 +d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1 +d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2 +fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1 +d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2 +c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3 +fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1 +7ff62415e4263c432c8acf6e424224209211eadb v3.3.4 +9ec811df548ed154a9bf9815383a916d6df31b98 v3.3.5rc1 +ca5635efe090f78806188ac2758f9948596aa8b2 v3.3.5rc2 +62cf4e77f78564714e7ea3d4bf1479ca1fbd0758 v3.3.5 +51317c9786f54267975abf2e9c502e6aaaa4a249 v3.3.6rc1 +971fec30da1fc5bf2b9fb28e09812a5127014211 v3.3.6 +46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1 +9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2 +dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3 +e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4 +3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1 +ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2 +a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3 +5e088cea8660677969113741c1313d570d977e02 v3.4.0rc1 +a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2 +8a81cdab3e9d521daaef989fade94b16455fc3b8 v3.4.0rc3 +04f714765c13824c3bc2835d7b008908862e083a v3.4.0 +c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1 +c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1 +8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1 +ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 +69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 -5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1 +5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): remove duplicate 3.4.3 tags
by benjamin.peterson Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/cpython/rev/ed27f53137ad changeset: 94765:ed27f53137ad branch: 3.4 parent: 94763:4ce53fdb6438 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Feb 26 22:49:21 2015 -0500 summary: remove duplicate 3.4.3 tags files: .hgtags | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -143,6 +143,4 @@ 8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1 ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 -9b73f1c3e6012e556da7e2d40dd7a382d3726334 v3.4.3 -9b73f1c3e6012e556da7e2d40dd7a382d3726334 v3.4.3 b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/cpython/rev/9b9887bd7734 changeset: 94766:9b9887bd7734 parent: 94764:2eb99070a38f parent: 94765:ed27f53137ad user: Benjamin Peterson <benjamin(a)python.org> date: Thu Feb 26 22:50:12 2015 -0500 summary: merge 3.4 files: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -143,4 +143,5 @@ 8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1 ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 +b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1 -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual
by steve.dower Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/cpython/rev/2eb99070a38f changeset: 94764:2eb99070a38f parent: 94756:7c6e3358221a user: Steve Dower <steve.dower(a)microsoft.com> date: Thu Feb 26 14:25:33 2015 -0800 summary: Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual environments (patch by Paul Moore) files: Doc/using/windows.rst | 20 ++++++++++++++ Doc/whatsnew/3.5.rst | 12 ++++++++ Misc/NEWS | 3 ++ PC/launcher.c | 42 ++++++++++++++++++++++++++++-- 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -404,6 +404,16 @@ Per-user installations of Python do not add the launcher to :envvar:`PATH` unless the option was selected on installation. +Virtual environments +^^^^^^^^^^^^^^^^^^^^ + +If the launcher is run with no explicit Python version specification, and a +virtual environment (created with the standard library :mod:`venv` module or +the external ``virtualenv`` tool) active, the launcher will run the virtual +environment's interpreter rather than the global one. To run the global +interpreter, either deactivate the virtual environment, or explicitly specify +the global Python version. + From a script ^^^^^^^^^^^^^ @@ -478,6 +488,16 @@ on Windows which you hope will be useful on Unix, you should use one of the shebang lines starting with ``/usr``. +Any of the above virtual commands can be suffixed with an explicit version +(either just the major version, or the major and minor version) - for example +``/usr/bin/python2.7`` - which will cause that specific version to be located +and used. + +The ``/usr/bin/env`` form of shebang line has one further special property. +Before looking for installed Python interpreters, this form will search the +executable :envvar:`PATH` for a Python executable. This corresponds to the +behaviour of the Unix ``env`` program, which performs a :envvar:`PATH` search. + Arguments in shebang lines -------------------------- diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -123,6 +123,18 @@ :pep:`475` -- Retry system calls failing with EINTR +PEP 486: Make the Python Launcher aware of virtual environments +--------------------------------------------------------------- + +:pep:`486` makes the Windows launcher (see :pep:`397`) aware of an active +virtual environment. When the default interpreter would be used and the +``VIRTUAL_ENV`` environment variable is set, the interpreter in the virtual +environment will be used. + +.. seealso:: + + :pep:`486` -- Make the Python Launcher aware of virtual environments + Other Language Changes ====================== diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -77,6 +77,9 @@ Windows ------- +- Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual + environments. Patch by Paul Moore. + - Issue #23437: Make user scripts directory versioned on Windows. Patch by Paul Moore. diff --git a/PC/launcher.c b/PC/launcher.c --- a/PC/launcher.c +++ b/PC/launcher.c @@ -384,6 +384,31 @@ } +static wchar_t * +find_python_by_venv() +{ + static wchar_t venv_python[MAX_PATH]; + wchar_t *virtual_env = get_env(L"VIRTUAL_ENV"); + DWORD attrs; + + /* Check for VIRTUAL_ENV environment variable */ + if (virtual_env == NULL || virtual_env[0] == L'\0') { + return NULL; + } + + /* Check for a python executable in the venv */ + debug(L"Checking for Python executable in virtual env '%ls'\n", virtual_env); + _snwprintf_s(venv_python, MAX_PATH, _TRUNCATE, + L"%ls\\Scripts\\%ls", virtual_env, PYTHON_EXECUTABLE); + attrs = GetFileAttributesW(venv_python); + if (attrs == INVALID_FILE_ATTRIBUTES) { + debug(L"Python executable %ls missing from virtual env\n", venv_python); + return NULL; + } + + return venv_python; +} + static wchar_t appdata_ini_path[MAX_PATH]; static wchar_t launcher_ini_path[MAX_PATH]; @@ -1309,6 +1334,7 @@ { wchar_t * wp; wchar_t * command; + wchar_t * executable; wchar_t * p; int rc = 0; size_t plen; @@ -1453,6 +1479,7 @@ if (ip == NULL) error(RC_NO_PYTHON, L"Requested Python version (%ls) not \ installed", &p[1]); + executable = ip->executable; command += wcslen(p); command = skip_whitespace(command); } @@ -1470,9 +1497,16 @@ #endif if (!valid) { - ip = locate_python(L""); - if (ip == NULL) - error(RC_NO_PYTHON, L"Can't find a default Python."); + /* Look for an active virtualenv */ + executable = find_python_by_venv(); + + /* If we didn't find one, look for the default Python */ + if (executable == NULL) { + ip = locate_python(L""); + if (ip == NULL) + error(RC_NO_PYTHON, L"Can't find a default Python."); + executable = ip->executable; + } if ((argc == 2) && (!_wcsicmp(p, L"-h") || !_wcsicmp(p, L"--help"))) { #if defined(_M_X64) BOOL canDo64bit = TRUE; @@ -1500,7 +1534,7 @@ fflush(stdout); } } - invoke_child(ip->executable, NULL, command); + invoke_child(executable, NULL, command); return rc; } -- Repository URL: https://hg.python.org/cpython

1 0

peps: Record acceptances of PEPs 441 and 486, including trivial fixes for each
by chris.angelico Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/peps/rev/1d3f1e41c8b8 changeset: 5711:1d3f1e41c8b8 user: Chris Angelico <rosuav(a)gmail.com> date: Fri Feb 27 09:19:06 2015 +1100 summary: Record acceptances of PEPs 441 and 486, including trivial fixes for each courtesy of Paul Moore files: pep-0441.txt | 7 ++++--- pep-0486.txt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pep-0441.txt b/pep-0441.txt --- a/pep-0441.txt +++ b/pep-0441.txt @@ -5,11 +5,12 @@ Author: Daniel Holth <dholth(a)gmail.com>, Paul Moore <p.f.moore(a)gmail.com> Discussions-To: https://mail.python.org/pipermail/python-dev/2015-February/138277.html -Status: Draft +Status: Accepted Type: Standards Track Content-Type: text/x-rst Created: 30 March 2013 Post-History: 30 March 2013, 1 April 2013, 16 February 2015 +Resolution: https://mail.python.org/pipermail/python-dev/2015-February/138578.html Improving Python ZIP Application Support ======================================== @@ -101,7 +102,7 @@ will be created from the content of that directory. * The name of an existing application archive file, in which case the file is copied to the target. The file name should include the - ``.pyz`` extension, if required. + ``.pyz`` or ``.pyzw`` extension, if required. * A file object open for reading in bytes mode. The content of the file should be an application archive, and the file object is assumed to be positioned at the start of the archive. @@ -172,7 +173,7 @@ The destination archive will have the specified name. The given name will be used as written, so should include the - ".pyz" extension. + ".pyz" or ".pyzw" extension. -p interpreter / --python interpreter diff --git a/pep-0486.txt b/pep-0486.txt --- a/pep-0486.txt +++ b/pep-0486.txt @@ -3,12 +3,13 @@ Version: $Revision$ Last-Modified: $Date$ Author: Paul Moore <p.f.moore(a)gmail.com> -Status: Draft +Status: Accepted Type: Standards Track Content-Type: text/x-rst Created: 12-Feb-2015 Python-Version: 3.5 -Post-History: +Post-History: 12-Feb-2015 +Resolution: https://mail.python.org/pipermail/python-dev/2015-February/138579.html Abstract @@ -51,7 +52,7 @@ python # Execute an installed module (these could use python -m, - # which is longer to type but is a little mopre similar to the + # which is longer to type but is a little more similar to the # launcher approach) pip install pytest py.test -- Repository URL: https://hg.python.org/peps

1 0

peps: Update to PEP 448 -- approved 2 out of 3, rejected *comprehension.
by guido.van.rossum Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/peps/rev/bf59e2ae3b3c changeset: 5710:bf59e2ae3b3c user: Guido van Rossum <guido(a)python.org> date: Thu Feb 26 12:17:47 2015 -0800 summary: Update to PEP 448 -- approved 2 out of 3, rejected *comprehension. files: pep-0448.txt | 115 ++++++++++++++++++++++---------------- 1 files changed, 65 insertions(+), 50 deletions(-) diff --git a/pep-0448.txt b/pep-0448.txt --- a/pep-0448.txt +++ b/pep-0448.txt @@ -4,11 +4,11 @@ Last-Modified: $Date$ Author: Joshua Landau <joshua(a)landau.ws> Discussions-To: python-ideas(a)python.org -Status: Draft +Status: Accepted Type: Standards Track Content-Type: text/x-rst Created: 29-Jun-2013 -Python-Version: 3.4 +Python-Version: 3.5 Post-History: @@ -50,15 +50,9 @@ >>> {**{'x': 2}, 'x': 1} {'x': 1} -Unpacking is proposed to be allowed inside list, set, -and dictionary comprehensions:: - - >>> ranges = [range(i) for i in range(5)] - >>> [*item for item in ranges] - [0, 0, 1, 0, 1, 2, 0, 1, 2, 3] - - >>> {*item for item in ranges} - {0, 1, 2, 3} +This PEP does not include unpacking operators inside list, set and +dictionary comprehensions although this has not been ruled out for +future proposals. Rationale @@ -121,14 +115,6 @@ *my_tuple, *my_range]``. -The addition of unpacking to comprehensions is a logical extension. -It's usage will primarily be a neat replacement for ``[i for j in -list_of_lists for i in j]``, as the more readable -``[*l for l in list_of_lists]``. The iterable version, -``(*l for l in list_of_lists)``, replaces ``itertools.chain.from_iterable``. -Other uses are possible, but expected to occur rarely. - - Specification ============= @@ -145,7 +131,8 @@ positional argument given both positionally and by keyword — a ``TypeError`` is raised. This remains true for duplicate arguments provided through multiple ``**`` unpackings, -e.g. ``f(**{'x': 2}, **{'x': 3})``. +e.g. ``f(**{'x': 2}, **{'x': 3})``, except that the error will be +detected at runtime. A function looks like this:: @@ -159,40 +146,17 @@ act as if the elements from unpacked items were inserted in order at the site of unpacking, much as happens in unpacking in a function-call. Dictionaries require ``**`` unpacking; all the others require ``*`` unpacking. -A dictionary's key remain in a right-to-left priority order, so + +The keys in a dictionary remain in a right-to-left priority order, so ``{**{'a': 1}, 'a': 2, **{'a': 3}}`` evaluates to ``{'a': 3}``. There is no restriction on the number or position of unpackings. -Comprehensions, by simple extension, will support unpacking. As before, -dictionaries require ``**`` unpacking, all the others require ``*`` -unpacking and key priorities are unchanged. - -For example:: - - {*[1, 2, 3], 4, 5, *{6, 7, 8}} - - (*e for e in [[1], [3, 4, 5], [2]]) - - {**dictionary for dictionary in (globals(), locals())} - - {**locals(), "override": None} - -Unbracketed comprehensions in function calls, such as ``f(x for x in it)``, -are already valid. These could be extended to:: - - f(*x for x in it) == f((*x for x in it)) - f(**x for x in it) == f({**x for x in it}) - -However, this is likely to be confusing and is not included in this -PEP. These will throw ``SyntaxError`` and comprehensions with explicit -brackets should be used instead. - Disadvantages ============= The allowable orders for arguments in a function call are more -complicated than before. The simplest explanation for the rules +complicated than before. The simplest explanation for the rules may be "positional arguments precede keyword arguments and ``**`` unpacking; ``*`` unpacking precedes ``**`` unpacking". @@ -200,24 +164,75 @@ ``elements = *iterable,`` causes ``elements`` to be a tuple. The reason for this may confuse people unfamiliar with the construct. +Concerns have been raised about the unexpected difference between +duplicate keys in dictionaries being allowed but duplicate keys +in function call syntax raising an error. Although this is already +the case with current syntax, this proposal might exacerbate the +issue. It remains to be seen how much of an issue this is in practice. + + +Variations +========== + +The PEP originally considered whether the ordering of argument types +in a function call (positional, keyword, ``*`` or ``**``) could become +less strict. This met little support so the idea was shelved. + +Earlier iterations of this PEP allowed unpacking operators inside +list, set, and dictionary comprehensions as a flattening operator +over iterables of containers:: + + >>> ranges = [range(i) for i in range(5)] + >>> [*item for item in ranges] + [0, 0, 1, 0, 1, 2, 0, 1, 2, 3] + + >>> {*item for item in ranges} + {0, 1, 2, 3} + +This was met with a mix of strong concerns about readability and mild +support. In order not to disadvantage the less controversial aspects +of the PEP, this was not accepted with the rest of the proposal. + +Unbracketed comprehensions in function calls, such as ``f(x for x in it)``, +are already valid. These could be extended to:: + + f(*x for x in it) == f((*x for x in it)) + f(**x for x in it) == f({**x for x in it}) + +However, it wasn't clear if this was the best behaviour or if it should +unpack into the arguments of the call to `f`. Since this is likely to be +confusing and is of only very marginal utility, it is not included in this +PEP. Instead, these will throw a ``SyntaxError`` and comprehensions with +explicit brackets should be used instead. + + +Approval +======== + +This PEP was accepted by Guido on February 25, 2015 [1]_. + Implementation ============== -An implementation for Python 3.5 is found at Issue 2292 on bug tracker [1]_. +An implementation for Python 3.5 is found at Issue 2292 on bug tracker [2]_. +This currently includes support for unpacking inside comprehensions, which +should be removed. References ========== -.. [1] Issue 2292, "Missing `*`-unpacking generalizations", Thomas Wouters +.. [1] PEP accepted, "PEP 448 review", Guido van Rossum + (https://mail.python.org/pipermail/python-dev/2015-February/138564.html) + +.. [2] Issue 2292, "Missing `*`-unpacking generalizations", Thomas Wouters (http://bugs.python.org/issue2292) -.. [2] Discussion on Python-ideas list, +.. [3] Discussion on Python-ideas list, "list / array comprehensions extension", Alexander Heger (http://mail.python.org/pipermail/python-ideas/2011-December/013097.html) - Copyright ========= -- Repository URL: https://hg.python.org/peps

1 0

peps: Apply PEP 441 changes from Paul Moore
by chris.angelico Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/peps/rev/a7f743bfd565 changeset: 5709:a7f743bfd565 user: Chris Angelico <rosuav(a)gmail.com> date: Fri Feb 27 04:36:44 2015 +1100 summary: Apply PEP 441 changes from Paul Moore files: pep-0441.txt | 130 ++++++++++++++++++++++++++++---------- 1 files changed, 94 insertions(+), 36 deletions(-) diff --git a/pep-0441.txt b/pep-0441.txt --- a/pep-0441.txt +++ b/pep-0441.txt @@ -73,6 +73,7 @@ standard and is how self-extracting ZIP archives and the bdist_wininst installer format work. + Minimal Tooling: The zipapp Module ================================== @@ -82,47 +83,75 @@ -m zipapp``) for their creation and manipulation. More complete tools for managing Python Zip Applications are -encouraged as 3rd party applications on PyPI. Currently, pyyzer [5]_ -and pex [6]_ are two tools known to exist. +encouraged as 3rd party applications on PyPI. Currently, pyzzer [5]_ +and pex [6]_ are two such tools. Module Interface ---------------- The zipapp module will provide the following functions: -``pack(directory, target=None, interpreter=None, main=None)`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +``create_archive(source, target=None, interpreter=None, main=None)`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Writes an application archive called *target*, containing the contents -of *directory*. The *target* can be a filename, or a file-like object -(which must be open for writing in bytes mode), or None (which means -use the name of *directory* with ``.pyz`` appended). If *interpreter* -is specified, it will be written to the start of the archive as a -shebang line and the file will be made executable (if no interpreter -is specified, the shebang line will be omitted). If the directory -contains no ``__main__.py`` file, the function will construct a -``__main__.py`` which calls the function specified in the *main* -argument (which should be in the form ``'pkg.mod:fn'``). +Create an application archive from *source*. The source can be any +of the following: -It is an error to specify *main* if the directory contains a -``__main__.py``, or to omit *main* when there is no ``__main__.py`` -(as that will result in an archive which has no main function and so -cannot be executed). +* The name of a directory, in which case a new application archive + will be created from the content of that directory. +* The name of an existing application archive file, in which case the + file is copied to the target. The file name should include the + ``.pyz`` extension, if required. +* A file object open for reading in bytes mode. The content of the + file should be an application archive, and the file object is + assumed to be positioned at the start of the archive. + +The *target* argument determines where the resulting archive will be +written: + +* If it is the name of a file, the archive will be written to that + file. +* If it is an open file object, the archive will be written to that + file object, which must be open for writing in bytes mode. +* If the target is omitted (or None), the source must be a directory + and the target will be a file with the same name as the source, with + a ``.pyz`` extension added. + +The *interpreter* argument specifies the name of the Python +interpreter with which the archive will be executed. It is written as +a "shebang" line at the start of the archive. On Unix, this will be +interpreted by the OS, and on Windows it will be handled by the Python +launcher. Omitting the *interpreter* results in no shebang line being +written. If an interpreter is specified, and the target is a +filename, the executable bit of the target file will be set. + +The *main* argument specifies the name of a callable which will be +used as the main program for the archive. It can only be specified if +the source is a directory, and the source does not already contain a +``__main__.py`` file. The *main* argument should take the form +"pkg.module:callable" and the archive will be run by importing +"pkg.module" and executing the given callable with no arguments. It +is an error to omit *main* if the source is a directory and does not +contain a ``__main__.py`` file, as otherwise the resulting archive +would not be executable. + +If a file object is specified for *source* or *target*, it is the +caller's responsibility to close it after calling create_archive. + +When copying an existing archive, file objects supplied only need +``read`` and ``readline``, or ``write`` methods. When creating an +archive from a directory, if the target is a file object it will be +passed to the ``zipfile.ZipFile`` class, and must supply the methods +needed by that class. ``get_interpreter(archive)`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Returns the interpreter specified in the shebang line of the *archive*. -If there is no shebang, the function returns ``None``. +Returns the interpreter specified in the shebang line of the +*archive*. If there is no shebang, the function returns ``None``. +The *archive* argument can be a filename or a file-like object open +for reading in bytes mode. -``set_interpreter(archive, new_archive, interpreter=None)`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Modifies the *archive*'s shebang line to contain the specified -interpreter, and writes the updated archive to *new_archive*. If the -*interpreter* is ``None``, removes the shebang line. The -*new_archive* argument can be a filename, or a file-like object open -for writing in byte mode. Command Line Usage ------------------ @@ -130,22 +159,25 @@ The zipapp module can be run with the python ``-m`` flag. The command line interface is as follows:: - python -m zipapp [options] directory + python -m zipapp directory [options] - Create an archive from the contents of the given directory. By - default, an archive will be created with the same name as the - source directory, with a .pyz extension. + Create an archive from the given directory. An archive will + be created from the contents of that directory. The archive + will have the same name as the source directory with a .pyz + extension. The following options can be specified: -o archive / --output archive - The destination archive will have the specified name. + The destination archive will have the specified name. The + given name will be used as written, so should include the + ".pyz" extension. -p interpreter / --python interpreter The given interpreter will be written to the shebang line - of the archive. If this option is not given, the archive + of the archive. If this option is not given, the archive will have no shebang line. -m pkg.mod:fn / --main pkg.mod:fn @@ -155,10 +187,36 @@ which calls fn from the module pkg.mod. The behaviour of the command line interface matches that of -``zipapp.pack()``. +``zipapp.create_archive()``. + +In addition, it is possible to use the command line interface to work +with an existing archive:: + + python -m zipapp app.pyz --show + + Displays the shebang line of an archive. Output is of the + form + + Interpreter: /usr/bin/env + or + Interpreter: <none> + + and is intended for diagnostic use, not for scripts. + + python -m zipapp app.pyz -o newapp.pyz [-p interpreter] + + Copy app.pyz to newapp.pyz, modifying the shebang line based + on the -p option (as for creating an archive, no -p option + means remove the shebang line). Specifying a destination is + mandatory. + + In-place modification of an archive is *not* supported, as the + risk of damaging archives is too great for a simple tool. As noted, the archives are standard zip files, and so can be unpacked -using any standard ZIP utility or Python's zipfile module. +using any standard ZIP utility or Python's zipfile module. For this +reason, no interfaces to list the contents of an archive, or unpack +them, are provided or needed. FAQ --- -- Repository URL: https://hg.python.org/peps

1 0

peps: Update final release date for (slightly slipped) Python 3.4.3.
by larry.hastings Feb. 26, 2015

Feb. 26, 2015

https://hg.python.org/peps/rev/de5f2f496d69 changeset: 5708:de5f2f496d69 user: Larry Hastings <larry(a)hastings.org> date: Thu Feb 26 06:01:00 2015 -0800 summary: Update final release date for (slightly slipped) Python 3.4.3. files: pep-0101.txt | 4 ++-- pep-0429.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pep-0101.txt b/pep-0101.txt --- a/pep-0101.txt +++ b/pep-0101.txt @@ -351,8 +351,8 @@ You should not see any files. I.e. you better not have any uncommitted changes in your working directory. - ___ Make sure you have virtualenv installed. The release script installs - Sphinx in a virtualenv when building the docs. + ___ Make sure you have virtualenv installed (for Python 2.7). The release + script installs Sphinx in a virtualenv when building the docs. For building the PDF docs, you also need a fairly complete installation of a recent TeX distribution such as texlive. diff --git a/pep-0429.txt b/pep-0429.txt --- a/pep-0429.txt +++ b/pep-0429.txt @@ -66,7 +66,7 @@ -------------- - 3.4.3 candidate 1: February 8, 2015 -- 3.4.3 final: February 22, 2015 +- 3.4.3 final: February 25, 2015 -- Repository URL: https://hg.python.org/peps

1 0