[Python-checkins] [3.7] bpo-37730: Fix usage of NotImplemented instead of NotImplementedError in docs. (GH-15062). (GH-15106)
Serhiy Storchaka
webhook-mailer at python.org
Sun Aug 4 10:06:59 EDT 2019
https://github.com/python/cpython/commit/8cd630578451a062dcf46fbb21274520ae36c399
commit: 8cd630578451a062dcf46fbb21274520ae36c399
branch: 3.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-08-04T17:06:51+03:00
summary:
[3.7] bpo-37730: Fix usage of NotImplemented instead of NotImplementedError in docs. (GH-15062). (GH-15106)
(cherry picked from commit ed5e8e06cbf766e89d6c58a882ee024abb5b2ed7)
Co-authored-by: David H <dheiberg at mozilla.com>
files:
M Doc/library/winreg.rst
M PC/clinic/winreg.c.h
M PC/winreg.c
diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
index e9c026102273..cb67f2f39d76 100644
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -456,7 +456,7 @@ This module offers the following functions:
*key* is an already open key, or one of the predefined :ref:`HKEY_* constants
<hkey-constants>`.
- Will generally raise :exc:`NotImplemented` if executed on a 32-bit operating
+ Will generally raise :exc:`NotImplementedError` if executed on a 32-bit operating
system.
If the key is not on the reflection list, the function succeeds but has no
@@ -471,7 +471,7 @@ This module offers the following functions:
*key* is an already open key, or one of the predefined :ref:`HKEY_* constants
<hkey-constants>`.
- Will generally raise :exc:`NotImplemented` if executed on a 32-bit operating
+ Will generally raise :exc:`NotImplementedError` if executed on a 32-bit operating
system.
Restoring reflection for a key does not affect reflection of any subkeys.
@@ -486,7 +486,7 @@ This module offers the following functions:
Returns ``True`` if reflection is disabled.
- Will generally raise :exc:`NotImplemented` if executed on a 32-bit
+ Will generally raise :exc:`NotImplementedError` if executed on a 32-bit
operating system.
diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index 6a5f613808c2..e9df3675b146 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -1003,7 +1003,7 @@ PyDoc_STRVAR(winreg_DisableReflectionKey__doc__,
" key\n"
" An already open key, or any one of the predefined HKEY_* constants.\n"
"\n"
-"Will generally raise NotImplemented if executed on a 32bit OS.\n"
+"Will generally raise NotImplementedError if executed on a 32bit OS.\n"
"\n"
"If the key is not on the reflection list, the function succeeds but has\n"
"no effect. Disabling reflection for a key does not affect reflection\n"
@@ -1039,7 +1039,7 @@ PyDoc_STRVAR(winreg_EnableReflectionKey__doc__,
" key\n"
" An already open key, or any one of the predefined HKEY_* constants.\n"
"\n"
-"Will generally raise NotImplemented if executed on a 32bit OS.\n"
+"Will generally raise NotImplementedError if executed on a 32bit OS.\n"
"Restoring reflection for a key does not affect reflection of any\n"
"subkeys.");
@@ -1073,7 +1073,7 @@ PyDoc_STRVAR(winreg_QueryReflectionKey__doc__,
" key\n"
" An already open key, or any one of the predefined HKEY_* constants.\n"
"\n"
-"Will generally raise NotImplemented if executed on a 32bit OS.");
+"Will generally raise NotImplementedError if executed on a 32bit OS.");
#define WINREG_QUERYREFLECTIONKEY_METHODDEF \
{"QueryReflectionKey", (PyCFunction)winreg_QueryReflectionKey, METH_O, winreg_QueryReflectionKey__doc__},
@@ -1095,4 +1095,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
exit:
return return_value;
}
-/*[clinic end generated code: output=60c92ffc7438f8cf input=a9049054013a1b77]*/
+/*[clinic end generated code: output=696f627d310ac599 input=a9049054013a1b77]*/
diff --git a/PC/winreg.c b/PC/winreg.c
index 1021609e582f..5f18876895c3 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -1697,7 +1697,7 @@ winreg.DisableReflectionKey
Disables registry reflection for 32bit processes running on a 64bit OS.
-Will generally raise NotImplemented if executed on a 32bit OS.
+Will generally raise NotImplementedError if executed on a 32bit OS.
If the key is not on the reflection list, the function succeeds but has
no effect. Disabling reflection for a key does not affect reflection
@@ -1706,7 +1706,7 @@ of any subkeys.
static PyObject *
winreg_DisableReflectionKey_impl(PyObject *module, HKEY key)
-/*[clinic end generated code: output=830cce504cc764b4 input=a6c9e5ca5410193c]*/
+/*[clinic end generated code: output=830cce504cc764b4 input=70bece2dee02e073]*/
{
HMODULE hMod;
typedef LONG (WINAPI *RDRKFunc)(HKEY);
@@ -1742,14 +1742,14 @@ winreg.EnableReflectionKey
Restores registry reflection for the specified disabled key.
-Will generally raise NotImplemented if executed on a 32bit OS.
+Will generally raise NotImplementedError if executed on a 32bit OS.
Restoring reflection for a key does not affect reflection of any
subkeys.
[clinic start generated code]*/
static PyObject *
winreg_EnableReflectionKey_impl(PyObject *module, HKEY key)
-/*[clinic end generated code: output=86fa1385fdd9ce57 input=7748abbacd1e166a]*/
+/*[clinic end generated code: output=86fa1385fdd9ce57 input=eeae770c6eb9f559]*/
{
HMODULE hMod;
typedef LONG (WINAPI *RERKFunc)(HKEY);
@@ -1785,12 +1785,12 @@ winreg.QueryReflectionKey
Returns the reflection state for the specified key as a bool.
-Will generally raise NotImplemented if executed on a 32bit OS.
+Will generally raise NotImplementedError if executed on a 32bit OS.
[clinic start generated code]*/
static PyObject *
winreg_QueryReflectionKey_impl(PyObject *module, HKEY key)
-/*[clinic end generated code: output=4e774af288c3ebb9 input=9f325eacb5a65d88]*/
+/*[clinic end generated code: output=4e774af288c3ebb9 input=a98fa51d55ade186]*/
{
HMODULE hMod;
typedef LONG (WINAPI *RQRKFunc)(HKEY, BOOL *);
More information about the Python-checkins
mailing list