Commit Graph

642 Commits

Author SHA1 Message Date
Zachary Ware 48e4bd6a02 Merge with 3.5 2016-08-17 09:52:32 -05:00
Zachary Ware 54005afeee Use sys.version_info, not sys.version.
sys.version[0] gives a string, which fails > comparison with 2.
Reported by Arne Maximilian Richter on docs@
2016-08-17 09:51:20 -05:00
Martin Panter 98cf1e79a1 Issue #27745: Merge typo fixes from 3.5 2016-08-12 12:05:48 +00:00
Martin Panter b4a2b36c99 Issue #27745: Fix some typos in Argument Clinic howto, by Lele Gaifax 2016-08-12 12:02:03 +00:00
Zachary Ware f03f7c75d8 Closes #27204: Merge with 3.5 2016-08-09 17:05:23 -05:00
Zachary Ware 378a1d77d9 Issue #27204: Fix doctests in Doc/howto
Patch by Jelle Zijlstra.
2016-08-09 16:47:04 -05:00
Senthil Kumaran cde03fa038 [merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:51:13 -07:00
Senthil Kumaran 17742f2d45 [merge from 3.4] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:39:06 -07:00
Senthil Kumaran 436fe5a447 [merge from 3.3] Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:34:34 -07:00
Senthil Kumaran 4cbb23f8f2 Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:24:16 -07:00
Martin Panter 6a09315ff0 Issue #26462: Merge code block fixes from 3.5 2016-07-29 01:49:37 +00:00
Martin Panter 8bde911115 Issue #27626: Merge spelling fixes from 3.5 2016-07-28 01:30:58 +00:00
Martin Panter eb9957065a Issue #27626: Spelling fixes in docs, comments and internal names
Based on patch by Ville Skyttä.
2016-07-28 01:11:04 +00:00
Martin Panter 1050d2d0c7 Issue #26462: Doc: reduce literal_block warnings, fix syntax highlighting.
Patch by Julien Palard.
2016-07-26 11:18:21 +02:00
Martin Panter 525a949251 Issue #27130: Merge zlib 64-bit fixes from 3.5 2016-07-23 03:39:49 +00:00
Martin Panter 84544c1020 Issue #27130: Fix handling of buffers exceeding UINT_MAX in “zlib” module
Patch by Xiang Zhang.
2016-07-23 03:02:07 +00:00
Berker Peksag 7577ad32d1 Issue #27378: Merge from 3.5 2016-06-24 08:55:06 +03:00
Berker Peksag 79af27ef2e Issue #27378: Remove an outdated reference from regex HOWTO
Patch by Matt Morrison.
2016-06-24 08:54:43 +03:00
Martin Panter e514093a2f Issue #27125: Merge typo fixes from 3.5 2016-05-30 05:24:49 +00:00
Martin Panter a90a4a9651 Issue #27125: Remove duplicated words from documentation and comments 2016-05-30 04:04:50 +00:00
Serhiy Storchaka c499f30286 Issue #23921: Standardized documentation whitespace formatting.
Original patch by James Edwards.
2016-05-10 12:01:56 +03:00
Serhiy Storchaka dba903993a Issue #23921: Standardized documentation whitespace formatting.
Original patch by James Edwards.
2016-05-10 12:01:23 +03:00
Martin Panter 1ce738e08f Merge typo fixes from 3.5 2016-05-08 14:02:35 +00:00
Martin Panter f0564164ba Fix typos in comments, documentation and test method names 2016-05-08 13:48:10 +00:00
Serhiy Storchaka 1acbf853c8 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:58 +03:00
Serhiy Storchaka 6dff0205b7 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:07 +03:00
Raymond Hettinger c5c43b8374 merge 2016-04-26 01:11:28 -07:00
Raymond Hettinger b9531bcdcc Issue #24715: Improve sort stability example 2016-04-26 01:11:10 -07:00
Benjamin Peterson 9046df0659 merge 3.5 (#26827) 2016-04-22 23:43:24 -07:00
Benjamin Peterson 95b5f0ad7e fix python 3 mod init function declaration (closes #26827) 2016-04-22 23:43:10 -07:00
Martin Panter cda80940ed Issue #15984: Merge PyUnicode doc from 3.5 2016-04-15 02:27:11 +00:00
Martin Panter 6245cb3c01 Correct “an” → “a” with “Unicode”, “user”, “UTF”, etc
This affects documentation, code comments, and a debugging messages.
2016-04-15 02:14:19 +00:00
Serhiy Storchaka 336fc5bbb0 Issue #25910: Fixed dead links in the docs. 2016-04-11 12:34:07 +03:00
Serhiy Storchaka 90be7333ea Issue #25910: Fixed dead links in the docs. 2016-04-11 12:18:56 +03:00
Vinay Sajip c334202f41 Merged documentation update from 3.5. 2016-04-01 23:13:48 +01:00
Vinay Sajip d93a60149c Added a cookbook recipe for a logging context manager. 2016-04-01 23:13:01 +01:00
Berker Peksag 5d7286c05d Issue #26593: Fix typo in logging HOWTO
Patch by Andrew Szeto.
2016-03-20 12:51:16 +02:00
Berker Peksag 563c949b11 Issue #26593: Fix typo in logging HOWTO
Patch by Andrew Szeto.
2016-03-20 12:50:56 +02:00
Brett Cannon 81ae89b611 Merge for issue #26095 2016-03-18 13:24:15 -07:00
Brett Cannon adcb654519 Suggest people use feature detection in porting guide 2016-03-18 13:23:58 -07:00
Berker Peksag f1fc8f953e Issue #24852: Remove outdated "HOWTO Use Python in the web" document 2016-03-07 19:01:05 +02:00
Berker Peksag b4f2f453e7 Issue #24852: Remove outdated "HOWTO Use Python in the web" document 2016-03-07 19:00:47 +02:00
Georg Brandl a7f7232838 merge with 3.5 2016-02-28 21:09:45 +01:00
Georg Brandl 76b2ee03c3 Fix typo. 2016-02-28 21:09:36 +01:00
Georg Brandl 3902d62c4e merge with 3.5 2016-02-26 19:37:52 +01:00
Georg Brandl 5d94134040 Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch. 2016-02-26 19:37:12 +01:00
Vinay Sajip d9dc53021e Merged cookbook update from 3.5. 2016-02-20 19:03:29 +00:00
Vinay Sajip e10d370a92 Added simple threading example to logging cookbook. 2016-02-20 19:02:46 +00:00
Benjamin Peterson bd8112901a merge 3.5 (#26378) 2016-02-17 23:43:08 -08:00
Benjamin Peterson 8f0432ffbb fix typo (closes #26378) 2016-02-17 23:42:46 -08:00
Martin Panter 3008b1c4bb Issue #26304: Merge doc wording from 3.5 2016-02-10 05:44:56 +00:00
Martin Panter c04fb56e36 Issue #26304: Change "allows to <verb>" to "allows <verb>ing" or similar
The original form is incorrect grammar and feels awkward, even though the
meaning is clear.
2016-02-10 05:44:01 +00:00
Senthil Kumaran 029f7f7af2 merge from 3.5 2016-02-05 19:37:47 -08:00
Senthil Kumaran b6213c5664 Fix userinfo example presented in urllib2 howto. 2016-02-05 19:37:23 -08:00
Martin Panter 5da4e86bc0 Issue #26220: Merge Unicode how-to from 3.5 2016-01-29 04:06:49 +00:00
Martin Panter 4942870471 Issue #26220: Remove outdated comment about a question mark 2016-01-29 04:01:16 +00:00
Ezio Melotti 1d37771292 #25517: merge with 3.5. 2016-01-12 00:09:43 +02:00
Ezio Melotti 84c63e8df4 #25517: fix regex in the regex howto. Patch by Elena Oat. 2016-01-12 00:09:13 +02:00
Martin Panter a561c038ab Issue #25576: Merge www-form-urlencoded doc from 3.5 2015-11-24 22:59:28 +00:00
Martin Panter f7e8d07538 Issue #25576: Merge www-form-urlencoded doc from 3.4 into 3.5 2015-11-24 22:57:46 +00:00
Martin Panter cda85a0d1c Issue #25576: Remove application/x-www-form-urlencoded charset advice
No charset parameter is standardized for this Content-Type value. Also
clarify that urlencode() outputs ASCII.
2015-11-24 22:33:18 +00:00
Martin Panter 36befa5b4c Issue #25626: Merge zlib fix from 3.5 2015-11-21 10:57:15 +00:00
Martin Panter e99e97762c Issue #25626: Change zlib to accept Py_ssize_t and cap to UINT_MAX
The underlying zlib library stores sizes in “unsigned int”. The corresponding
Python parameters are all sizes of buffers filled in by zlib, so it is okay
to reduce higher values to the UINT_MAX internal cap. OverflowError is still
raised for sizes that do not fit in Py_ssize_t.

Sizes are now limited to Py_ssize_t rather than unsigned long, because Python
byte strings cannot be larger than Py_ssize_t. Previously this could result
in a SystemError on 32-bit platforms.

This resolves a regression in the gzip module when reading more than UINT_MAX
or LONG_MAX bytes in one call, introduced by revision 62723172412c.
2015-11-20 08:13:35 +00:00
Serhiy Storchaka 4a7c03aab4 Issue #25523: Merge a-to-an corrections from 3.5. 2015-11-02 14:44:29 +02:00
Serhiy Storchaka a84f6c3dd3 Issue #25523: Merge a-to-an corrections from 3.4. 2015-11-02 14:39:05 +02:00
Serhiy Storchaka d65c9496da Issue #25523: Further a-to-an corrections. 2015-11-02 14:10:23 +02:00
Berker Peksag 3b1cb71084 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:42:17 +03:00
Berker Peksag db6cdf8425 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:41:59 +03:00
Berker Peksag f84499a4e3 rstlint: Fix "default role used" warning
This should make buildbots green.
2015-10-20 03:41:38 +03:00
Vinay Sajip d469cff021 Merged cookbook update from 3.5. 2015-10-17 13:59:41 +01:00
Vinay Sajip a83a0e2316 Merged cookbook update from 3.4. 2015-10-17 13:59:12 +01:00
Vinay Sajip 4de9dae57d Added entry to logging cookbook. 2015-10-17 13:58:19 +01:00
Victor Stinner 91108f049f Issue #25210: Change error message of do_richcompare()
Don't add parenthesis to type names. Add also quotes around the type names.

Before:

  TypeError: unorderable types: int() < NoneType()

After:

  TypeError: '<' not supported between instances of 'int' and 'NoneType'
2015-10-14 18:25:31 +02:00
Vinay Sajip 09a00eb076 Closes #25344: Merged fix from 3.4. 2015-10-10 00:53:37 +01:00
Vinay Sajip ff1f3d9ff1 Closes #25344: Added cookbook recipe to show buffering of logging events. 2015-10-10 00:52:35 +01:00
Benjamin Peterson fc2fb0f621 merge 3.4 (#25145) 2015-09-20 23:18:51 +05:00
Benjamin Peterson 16ad5cfad3 remove reference to PyGoogle (#25145)
Patch by Bar Harel.
2015-09-20 23:17:41 +05:00
Benjamin Peterson 95acbcedc4 use a more modern UA (#25145) 2015-09-20 23:16:45 +05:00
Senthil Kumaran b4760efbad Back porting changeset db302b88fdb6 to 3.4 branch, which fixed multiple documentation typos.
Related Issues:

#issue21528
#issue24453
2015-06-14 17:35:37 -07:00
Berker Peksag fee05daef8 Issue #24232: Fix typos. Patch by Ville Skyttä. 2015-05-19 01:38:05 +03:00
Berker Peksag 315e104d11 Issue #24232: Fix typos. Patch by Ville Skyttä. 2015-05-19 01:36:55 +03:00
Tal Einat 97fceee3b9 Argument Clinic: added missing bit of info in howto 2015-05-16 14:12:15 +03:00
Yury Selivanov 8170e8c0d1 PEP 479: Change StopIteration handling inside generators.
Closes issue #22906.
2015-05-09 11:44:30 -04:00
Larry Hastings 38337d1e15 Issue #24000: Improved Argument Clinic's mapping of converters to legacy
"format units".  Updated the documentation to match.
2015-05-07 23:30:09 -07:00
Brett Cannon 8396b8ef08 Fix a grammar error in the porting HOWTO as found by Eric Smith. 2015-04-13 16:32:16 -04:00
Brett Cannon fd53f98459 Issue #23733: Mention bytes.__mod__ in the porting HOWTO. 2015-04-13 16:21:07 -04:00
Antoine Pitrou 3764fc2951 Fix doc build error 2015-04-13 21:07:57 +02:00
Brett Cannon 4269d6db93 Issue #23732: Mention the new -b semantics in the porting HOWTO. 2015-04-13 14:37:50 -04:00
Berker Peksag 556e08e9b2 Issue #12955: Change the urlopen() examples to use context managers where appropriate.
Patch by Martin Panter.
2015-04-12 13:53:33 +03:00
Berker Peksag 9575e1891f Issue #12955: Change the urlopen() examples to use context managers where appropriate.
Patch by Martin Panter.
2015-04-12 13:52:49 +03:00
Serhiy Storchaka a54aae0683 Issue #23622: Unknown escapes in regular expressions that consist of ``'\'``
and ASCII letter now raise a deprecation warning and will be forbidden in
Python 3.6.
2015-03-24 22:58:14 +02:00
Brett Cannon cb1dde5df5 Merge 3.4 2015-03-13 12:50:16 -04:00
Brett Cannon 2645bad04f Make the case to only support Python 2.7 when supporting 2/3 simultaneously 2015-03-13 12:49:44 -04:00
Brett Cannon b44ed82b81 Merge with 3.4 for porting HOWTO tweaks 2015-02-27 15:10:38 -05:00
Brett Cannon fdde79dbf6 Fix the clarification as to why division cannot be ported automatically 2015-02-27 15:10:03 -05:00
Vinay Sajip 365701add9 Added respect_handler_level to QueueListener. 2015-02-09 19:49:00 +00:00
Vinay Sajip 7929be6aeb Merged documentation update from 3.4. 2015-02-01 15:18:14 +00:00
Vinay Sajip f046dfe60e Added a cookbook entry on logging audible messages. 2015-02-01 15:17:34 +00:00
Vinay Sajip 85ad88dbc6 Merged documentation update from 3.4. 2015-01-28 07:33:14 +00:00
Vinay Sajip db07164053 Added a logging cookbook entry on customized exception formatting. 2015-01-28 07:32:38 +00:00