Remove magic number in test and update deprecated message

Author: aisk

Lib/test/test_winreg.py

@@ -275,15 +275,14 @@ def test_registry_works_with_options(self):
                                                 reserved=REG_OPTION_VOLATILE)
             self._read_test_data(HKEY_CURRENT_USER, OpenKey=ok)
 
-        # TypeError cases
         with self.assertRaises(TypeError):
             OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 0, KEY_READ, 0)
         with self.assertRaises(TypeError):
             OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 0, KEY_READ, options=0)
         with self.assertRaises(TypeError):
-            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, 1, KEY_READ, reserved=1)
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, REG_OPTION_VOLATILE, KEY_READ, reserved=REG_OPTION_VOLATILE)
         with self.assertRaises(TypeError):
-            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, options=1, reserved=1)
+            OpenKeyEx(HKEY_CURRENT_USER, test_key_name, options=REG_OPTION_VOLATILE, reserved=REG_OPTION_VOLATILE)
 
         self._delete_test_data(HKEY_CURRENT_USER)
 

PC/winreg.c

@@ -1451,7 +1451,7 @@ winreg_OpenKeyEx_impl(PyObject *module, HKEY key, const wchar_t *sub_key,
     }
     if (reserved != 0) {
         if (PyErr_WarnEx(PyExc_DeprecationWarning,
-            "reserved is deprecated, use options instead.", 1))
+            "reserved is deprecated, use OpenKeyEx with options parameter instead.", 1))
         {
             return NULL;
         }