Merge lp:~brian.curtin/ubuntu-sso-client/py3-winreg into lp:ubuntu-sso-client

[Brian Curtin]

Convert _winreg importing to use winreg on both Python 2 and 3

Python 3 changed the _winreg module to winreg. The easiest way to work with that change is to try to import _winreg as winreg, and if that fails, just import winreg since we're on Python 3. Since the names imported from the module are few, move back to importing the module and accessing the names on the module rather than directly importing names from the module. It's easier to maintain that way.

[dobey (dobey)]

I think in these try/except import cases, we should be trying to import the new thing, and only importing the old one if it fails. Doing this also makes it clear by looking at the code, which one is the old one (the fallback).

[Manuel de la Peña (mandel)]

I agree with dobey, in theory we will be running this on python 3 in the near future.. so making the import fail on python 2 more often than on python 3 makes sense.

review: Needs Fixing

[lp:~brian.curtin/ubuntu-sso-client/py3-winreg]

978. By Brian Curtin on 2012-06-27

Try the 3 way and fall back to the 2 way

[Alejandro J. Cura (alecu)]

Looks great!

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntu_sso/main/tests/test_windows.py'
--- ubuntu_sso/main/tests/test_windows.py	2012-04-30 16:15:46 +0000
+++ ubuntu_sso/main/tests/test_windows.py	2012-06-27 20:19:18 +0000
@@ -29,7 +29,10 @@
 """Windows specific tests for the main module."""
 
 # pylint: disable=F0401
-from _winreg import REG_SZ
+try:
+    import winreg
+except ImportError:
+    import _winreg as winreg
 
 from twisted.internet import defer
 
@@ -111,8 +114,10 @@
     def test_get_activation_cmdline(self):
         """Test the get_activation_cmdline method."""
         sample_value = "test 123"
-        self.patch(windows, "OpenKey", lambda key, subkey: sample_value)
-        self.patch(windows, "QueryValueEx", lambda key, v: (key, REG_SZ))
+        self.patch(windows.winreg, "OpenKey",
+                   lambda key, subkey: sample_value)
+        self.patch(windows.winreg, "QueryValueEx",
+                   lambda key, v: (key, winreg.REG_SZ))
         cmdline = windows.get_activation_cmdline(
             perspective_broker.SSO_SERVICE_NAME)
         self.assertEqual(sample_value, cmdline)

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2012-04-30 16:15:46 +0000
+++ ubuntu_sso/main/windows.py	2012-06-27 20:19:18 +0000
@@ -41,7 +41,10 @@
 # pylint: disable=F0401
 import win32process
 import win32security
-from _winreg import HKEY_LOCAL_MACHINE, OpenKey, QueryValueEx
+try:
+    import winreg
+except ImportError:
+    import _winreg as winreg
 # pylint: enable=F0401
 
 from twisted.internet import defer
@@ -83,9 +86,9 @@
 
 def get_activation_cmdline(name):
     """Find the path to the executable callback."""
-    key = OpenKey(HKEY_LOCAL_MACHINE, U1_REG_PATH)
+    key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, U1_REG_PATH)
     # pylint: disable=W0612
-    value, registry_type = QueryValueEx(key, "path-" + name)
+    value, registry_type = winreg.QueryValueEx(key, "path-" + name)
     return value