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

[Manuel de la Peña]

Fixed setup.py issues so that we can build .debs. This branch depends on the use of lp:~mandel/python-distutils-extra/import_issues

Fixed setup.py issues so that we can build .debs. This branch depends on the use of lp:~mandel/python-distutils-extra/import_issues

[James Henstridge (jamesh)]

Looks good. Running "setup.py install" correctly installs the two missing sub-packages now. I son't get any error related to the wintypes module either using the new DistutilsExtra version.

On IRC I asked Manuel about the new annotations in ubuntu_sso/networkstate/windows.py. He says that they are for use by a future DistutilsExtra feature. Since Manuel is the main person touching this code, I don't see any problem leaving these in place even though they don't do anything yet.

review: Approve

[Roman Yepishev (rye)]

Did a full build of sso client with pbuilder and import_issues/DistUtilsExtra copied to SSO directory.
SSO client is now working again.

review: Approve (fieldtest)

=== modified file 'setup.py'
--- setup.py	2011-02-03 15:07:48 +0000
+++ setup.py	2011-03-15 20:42:34 +0000
@@ -94,7 +94,8 @@
     long_description='Desktop service to allow applications to sign in' \
         'to Ubuntu services via SSO',
     url='https://launchpad.net/ubuntu-sso-client',
-    packages=['ubuntu_sso', 'ubuntu_sso.gtk', 'ubuntu_sso.utils'],
+    packages=['ubuntu_sso', 'ubuntu_sso.gtk', 'ubuntu_sso.utils',
+              'ubuntu_sso.keyring', 'ubuntu_sso.networkstate'],
     data_files=[
         ('share/dbus-1/services', ['data/com.ubuntu.sso.service']),
         ('lib/ubuntu-sso-client', ['bin/ubuntu-sso-login']),

=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2011-03-10 15:55:08 +0000
+++ ubuntu_sso/networkstate/windows.py	2011-03-15 20:42:34 +0000
@@ -16,10 +16,12 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Network status implementation on Windows."""
 
+
 # pylint: disable=F0401
+# distutils-extra: ignore-import=pythoncom,win32com.server.policy
+# distutils-extra: ignore-import=win32com.client
 import pythoncom
 # pylint: enable=F0401
-
 from ctypes import windll, byref
 from ctypes.wintypes import DWORD
 from threading import Thread