Merge lp:~mandel/ubuntu-sso-client/fix_732057 into lp:ubuntu-sso-client

[Manuel de la Peña]

Fixed bug by using the os module so that the correct null fd is used according to the platform.

Fixed bug by using the os module.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Shane Fagan (shanepatrickfagan)]

Rechecked it and looking good

review: Approve

=== modified file 'ubuntu_sso/keyring/tests/test_windows.py'
--- ubuntu_sso/keyring/tests/test_windows.py	2011-03-16 14:48:56 +0000
+++ ubuntu_sso/keyring/tests/test_windows.py	2011-03-24 16:15:55 +0000
@@ -19,11 +19,12 @@
 from json import dumps
 from mocker import MockerTestCase
 from twisted.internet.defer import inlineCallbacks
+from twisted.trial.unittest import TestCase
 
 from ubuntu_sso.keyring.windows import Keyring, USERNAME
 
 
-class TestWindowsKeyring(MockerTestCase):
+class TestWindowsKeyring(MockerTestCase, TestCase):
     """Test the windows keyring implementation."""
 
     def setUp(self):

=== modified file 'ubuntu_sso/tests/test_credentials.py'
--- ubuntu_sso/tests/test_credentials.py	2011-01-02 03:34:23 +0000
+++ ubuntu_sso/tests/test_credentials.py	2011-03-24 16:15:55 +0000
@@ -19,6 +19,7 @@
 """Tests for the Credentials module."""
 
 import logging
+import os
 import urllib
 
 from twisted.internet import defer
@@ -352,7 +353,7 @@
         def faked_urlopen(request):
             """Fake urlopener."""
             self._request = request
-            response = urllib.addinfourl(fp=open('/dev/null'),
+            response = urllib.addinfourl(fp=open(os.path.devnull),
                                          headers=request.headers,
                                          url=request.get_full_url(),
                                          code=200)