Commit graph

95044 commits

Author SHA1 Message Date
Berker Peksag
9f4712af25 Issue #23710: Merge from 3.5 2016-08-03 12:59:16 +03:00
Berker Peksag
bed6891c77 Issue #23710: Update PyObject_HEAD documentation
Since PEP 3123, PyObject_HEAD only has one field named ob_base.
Users now need to use the Py_TYPE macro instead of self->ob_type.

Initial patch by Ammar Askar.
2016-08-03 12:58:49 +03:00
Stefan Krah
0d60c56e7e Merge 3.5. 2016-08-03 11:18:54 +02:00
Stefan Krah
9de620e970 Issue #20767: Fix -R option for FreeBSD/clang. 2016-08-03 11:18:26 +02:00
Berker Peksag
91494d3b73 Issue #26576: Merge from 3.5 2016-08-03 10:17:51 +03:00
Berker Peksag
6cafececbf Issue #26576: Clarify that the @deco syntax is not always an equivalent of f = deco(f)
Patch by Chris Angelico.
2016-08-03 10:17:21 +03:00
Alexander Belopolsky
43746c3770 Closes #27661: Added tzinfo keyword argument to datetime.combine. 2016-08-02 17:49:30 -04:00
Stefan Krah
711120d8fd Merge 3.5. 2016-08-02 22:30:57 +02:00
Stefan Krah
e12a68be35 Issue #27241: Catch exception when running pstats as main. 2016-08-02 22:30:24 +02:00
Serhiy Storchaka
133138a284 Issue #22557: Now importing already imported modules is up to 2.5 times faster. 2016-08-02 22:51:21 +03: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
7bfbd1d3c5 merge heads 2016-07-30 23:48:19 -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
Benjamin Peterson
bf5868d2c5 merge 3.5 (#27656) 2016-07-30 23:22:24 -07:00
Benjamin Peterson
dbaa559b7f all SCHED_ constants are optional (closes #27656) 2016-07-30 23:21:50 -07:00
Nick Coghlan
607e1c4c44 Issue 27366: PEP 487 docs updates
- Porting note for type keyword arg handling
- __init_subclass__ note regarding  metaclass hint
2016-07-31 12:42:49 +10:00
Alexander Belopolsky
07e2a0aba9 Issue 24773: Use the standard Asia/Tehran name in the Iran test. 2016-07-30 11:41:02 -04:00
Berker Peksag
a787e5f31d Issue #27652: Expose ESHUTDOWN conditionally
ESHUTDOWN is also exposed conditionally in Modules/errnomodule.c.

Patch by Ed Schouten.
2016-07-30 14:14:12 +03:00
Berker Peksag
01d1719062 Issue #27366: Tweak PEP 487 documentation
* Added versionadded directives
* Deleted duplicate sentence from __init_subclass__ docstring
* Modernized tests
2016-07-30 14:06:15 +03:00
Xavier de Gaye
6074f217db (merge from 3.5) Issue #27453: CPP invocation in configure must use CPPFLAGS.
Patch by Chi Hsuan Yen.
2016-07-30 11:36:32 +02:00
Xavier de Gaye
3a32bdfaa7 Issue #27453: CPP invocation in configure must use CPPFLAGS.
Patch by Chi Hsuan Yen.
2016-07-30 11:28:35 +02:00
Nick Coghlan
d78448e912 Issue #27366: Implement PEP 487
- __init_subclass__ called when new subclasses defined
- __set_name__ called when descriptors are part of a
  class definition
2016-07-30 16:26:03 +10:00
Berker Peksag
f6daa690e4 Merge from 3.5 2016-07-30 03:48:12 +03:00
Berker Peksag
fa95068081 Silence another "default role used" warning in typing.rst
This should make ware-docs green again.
2016-07-30 03:47:52 +03:00
Berker Peksag
23aa24bc68 Fix "default role used" warning in shlex.rst 2016-07-30 03:40:38 +03:00
Guido van Rossum
a9333b1207 Fix whitespace. 2016-07-29 15:41:35 -07:00
Guido van Rossum
c301cbf445 Fix whitespace. 2016-07-29 15:41:17 -07:00
Guido van Rossum
e608709675 Expand documentation about type aliases and NewType in the typing module (merge 3.5 -> 3.6).
By Michael Lee.
2016-07-29 15:39:36 -07:00
Guido van Rossum
342e800e97 Expand documentation about type aliases and NewType in the typing module.
By Michael Lee.
2016-07-29 15:38:14 -07:00
Vinay Sajip
c1f974c944 Closes #1521950: Made shlex parsing more shell-like. 2016-07-29 22:35:03 +01:00
Martin Panter
43a94a7e2f Issue #27641: Comment out regeneration rules when cross compiling 2016-07-29 05:52:32 +00:00
Martin Panter
d2f87472fe Issue #17596: MINGW: add wincrypt.h in Python/random.c
Based on patch by Roumen Petrov.
2016-07-29 04:00:44 +00:00
Martin Panter
6a09315ff0 Issue #26462: Merge code block fixes from 3.5 2016-07-29 01:49:37 +00:00
Zachary Ware
10ea19f69c Merge with 3.5 2016-07-28 19:01:09 -05:00
Zachary Ware
87ec85f420 Correct typo in Windows docs.
Found by Jack Copper on docs@
2016-07-28 19:00:53 -05:00
Zachary Ware
28c3184d8d Issue #27647: Update Windows build to Tcl/Tk 8.6.6 2016-07-28 18:39:11 -05:00
Victor Stinner
6276b47fd5 Merge 3.5 (issue #27404) 2016-07-28 17:08:52 +02:00
Victor Stinner
4a865a35cd NEWS: tag security related changes with [Security] prefix
Issue #27404.
2016-07-28 17:06:25 +02:00
Martin Panter
2faa65a10d Issue #23943: Merge spelling fixes from 3.5 2016-07-28 03:53:59 +00:00
Martin Panter
3e5b1d3cf5 Issue #23943: Restore extra fixes lost in merge 4fb2075952a4 2016-07-28 03:48:29 +00:00
Terry Jan Reedy
2553b1b057 Issue #27620: Make htest box respond to <Return> and <Escape>. 2016-07-27 22:17:05 -04:00
Terry Jan Reedy
6b37dfce5b Issue #27620: Mark the default action button as the default. 2016-07-27 21:42:54 -04:00
Martin Panter
263893c261 Issue #27626: Further spelling fixes for 3.6 2016-07-28 01:25:31 +00:00
Martin Panter
8bde911115 Issue #27626: Merge spelling fixes from 3.5 2016-07-28 01:30:58 +00:00
Martin Panter
4b53359090 Issue #27490: Merge pgen cross-compile logic from 3.5 2016-07-28 01:30:06 +00:00
Martin Panter
eac67be948 Issue #27490: Do not build pgen when cross-compiling
The dependendency on the $(PGEN) variable must only be
set when not cross-compiling. When cross-compiling,
$(PGEN) will not be used, so no need to build it.

Patch by Thomas Perl.
2016-07-28 01:28:27 +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
Victor Stinner
2561726aa6 Merge 3.5 (issue #11048) 2016-07-27 16:59:22 +02:00