[pypy-commit] pypy py3k: stdlib's test_winreg expects these keyword args

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63582:2158de4626f4
Date: 2013-04-23 20:39 -0700
http://bitbucket.org/pypy/pypy/changeset/2158de4626f4/

Log:	stdlib's test_winreg expects these keyword args

diff --git a/pypy/module/_winreg/interp_winreg.py b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
+++ b/pypy/module/_winreg/interp_winreg.py
@@ -471,8 +471,8 @@
             raiseWindowsError(space, ret, 'CreateKey')
         return space.wrap(W_HKEY(rethkey[0]))
 
- at unwrap_spec(subkey=str, res=int, sam=rffi.r_uint)
-def CreateKeyEx(space, w_hkey, subkey, res=0, sam=rwinreg.KEY_WRITE):
+ at unwrap_spec(sub_key=str, reserved=int, access=rffi.r_uint)
+def CreateKeyEx(space, w_key, sub_key, reserved=0, access=rwinreg.KEY_WRITE):
     """key = CreateKey(key, sub_key) - Creates or opens the specified key.
 
 key is an already open key, or one of the predefined HKEY_* constants
@@ -484,10 +484,10 @@
 
 The return value is the handle of the opened key.
 If the function fails, an exception is raised."""
-    hkey = hkey_w(w_hkey, space)
+    hkey = hkey_w(w_key, space)
     with lltype.scoped_alloc(rwinreg.PHKEY.TO, 1) as rethkey:
-        ret = rwinreg.RegCreateKeyEx(hkey, subkey, res, None, 0,
-                                     sam, None, rethkey,
+        ret = rwinreg.RegCreateKeyEx(hkey, sub_key, reserved, None, 0,
+                                     access, None, rethkey,
                                      lltype.nullptr(rwin32.LPDWORD.TO))
         if ret != 0:
             raiseWindowsError(space, ret, 'CreateKeyEx')
@@ -521,8 +521,8 @@
     if ret != 0:
         raiseWindowsError(space, ret, 'RegDeleteValue')
 
- at unwrap_spec(subkey=str, res=int, sam=rffi.r_uint)
-def OpenKey(space, w_hkey, subkey, res=0, sam=rwinreg.KEY_READ):
+ at unwrap_spec(sub_key=str, reserved=int, access=rffi.r_uint)
+def OpenKey(space, w_key, sub_key, reserved=0, access=rwinreg.KEY_READ):
     """key = OpenKey(key, sub_key, res = 0, sam = KEY_READ) - Opens the specified key.
 
 key is an already open key, or any one of the predefined HKEY_* constants.
@@ -533,9 +533,9 @@
 
 The result is a new handle to the specified key
 If the function fails, an EnvironmentError exception is raised."""
-    hkey = hkey_w(w_hkey, space)
+    hkey = hkey_w(w_key, space)
     with lltype.scoped_alloc(rwinreg.PHKEY.TO, 1) as rethkey:
-        ret = rwinreg.RegOpenKeyEx(hkey, subkey, res, sam, rethkey)
+        ret = rwinreg.RegOpenKeyEx(hkey, sub_key, reserved, access, rethkey)
         if ret != 0:
             raiseWindowsError(space, ret, 'RegOpenKeyEx')
         return space.wrap(W_HKEY(rethkey[0]))
diff --git a/pypy/module/_winreg/test/test_winreg.py b/pypy/module/_winreg/test/test_winreg.py
--- a/pypy/module/_winreg/test/test_winreg.py
+++ b/pypy/module/_winreg/test/test_winreg.py
@@ -246,3 +246,12 @@
             raises(NotImplementedError, DeleteKeyEx, self.root_key,
                    self.test_key_name)
 
+    def test_named_arguments(self):
+        from winreg import KEY_ALL_ACCESS, CreateKeyEx, DeleteKey, OpenKeyEx
+        with CreateKeyEx(key=self.root_key, sub_key=self.test_key_name,
+                         reserved=0, access=KEY_ALL_ACCESS) as ckey:
+            assert ckey.handle != 0
+        with OpenKeyEx(key=self.root_key, sub_key=self.test_key_name,
+                       reserved=0, access=KEY_ALL_ACCESS) as okey:
+            assert okey.handle != 0
+        DeleteKey(self.root_key, self.test_key_name)