8000 Merge 3.3 · python/cpython@a5e7cd0 · GitHub
[go: up one dir, main page]

Skip to content

Commit a5e7cd0

Browse files
committed
Merge 3.3
2 parents f138055 + 6b879fa commit a5e7cd0

File tree

3 files changed

+122
-92
lines changed

3 files changed

+122
-92
lines changed

Doc/library/winreg.rst

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This module offers the following functions:
6868
alias of :exc:`OSError`.
6969

7070

71-
.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_ALL_ACCESS)
71+
.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE)
7272

7373
Creates or opens the specified key, returning a
7474
:ref:`handle object <handle-object>`.
@@ -78,10 +78,10 @@ This module offers the following functions:
7878

7979
*sub_key* is a string that names the key this method opens or creates.
8080

81-
*res* is a reserved integer, and must be zero. The default is zero.
81+
*reserved* is a reserved integer, and must be zero. The default is zero.
8282

83-
*sam* is an integer that specifies an access mask that describes the desired
84-
security access for the key. Default is :const:`KEY_ALL_ACCESS`. See
83+
*access* is an integer that specifies an access mask that describes the desired
84+
security access for the key. Default is :const:`KEY_WRITE`. See
8585
:ref:`Access Rights <access-rights>` for other allowed values.
8686

8787
If *key* is one of the predefined keys, *sub_key* may be ``None``. In that
@@ -119,7 +119,7 @@ This module offers the following functions:
119119
alias of :exc:`OSError`.
120120

121121

122-
.. function:: DeleteKeyEx(key, sub_key, access=KEY_ALL_ACCESS, reserved=0)
122+
.. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)
123123

124124
Deletes the specified key.
125125

@@ -136,9 +136,9 @@ This module offers the following functions:
136136
*key* parameter. This value must not be ``None``, and the key may not have
137137
subkeys.
138138

139-
*res* is a reserved integer, and must be zero. The default is zero.
139+
*reserved* is a reserved integer, and must be zero. The default is zero.
140140

141-
*sam* is an integer that specifies an access mask that describes the desired
141+
*access* is an integer that specifies an access mask that describes the desired
142142
security access for the key. Default is :const:`KEY_ALL_ACCESS`. See
143143
:ref:`Access Rights <access-rights>` for other allowed values.
144144

@@ -272,6 +272,7 @@ This module offers the following functions:
272272

273273

274274
.. function:: OpenKey(key, sub_key, reserved=0, access=KEY_READ)
275+
OpenKeyEx(key, sub_key, reserved=0, access=KEY_READ)
275276

276277
Opens the specified key, returning a :ref:`handle object <handle-object>`.
277278

@@ -298,12 +299,6 @@ This module offers the following functions:
298299
alias of :exc:`OSError`.
299300

300301

301-
.. function:: OpenKeyEx()
302-
303-
The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`,
304-
by the use of default arguments.
305-
306-
307302
.. function:: QueryInfoKey(key)
308303

309304
Returns information about a key, as a tuple.
@@ -427,11 +422,11 @@ This module offers the following functions:
427422
*value_name* is a string that names the subkey with which the value is
428423
associated.
429424

425+
*reserved* can be anything -- zero is always passed to the API.
426+
430427
*type* is an integer that specifies the type of the data. See
431428
:ref:`Value Types <value-types>` for the available types.
432429

433-
*reserved* can be anything -- zero is always passed to the API.
434-
435430
*value* is a string that specifies the new value.
436431

437432
This method can also set additional value and type information for the specified

Misc/NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
1010
Core and Builtins
1111
-----------------
1212

13+
- Issue #16197: Update winreg docstrings and documentation to match code.
14+
Patch by Zachary Ware.
15+
1316
- Issue #16241: Document -X faulthandler command line option.
1417
Patch by Marek Šuppa.
1518

0 commit comments

Comments
 (0)
0