[xmloutput:MERGE] Remove unused imports

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

With the latest bzr.dev, I got this error:
Traceback (most recent call last):
  File "/home/abentley/bzr/send-hookage/bzrlib/commands.py", line 923,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/abentley/bzr/send-hookage/bzrlib/commands.py", line 868,
in run_bzr
    ret = run(*run_argv)
  File "/home/abentley/bzr/send-hookage/bzrlib/commands.py", line 547,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/abentley/bzr/send-hookage/bzrlib/builtins.py", line 3203,
in run
    result = selftest(**selftest_kwargs)
  File "/home/abentley/bzr/send-hookage/bzrlib/tests/__init__.py", line
2707, in selftest
    suite = test_suite(keep_only, starting_with)
  File "/home/abentley/bzr/send-hookage/bzrlib/tests/__init__.py", line
3127, in test_suite
    plugin_suite = plugin.test_suite()
  File "/home/abentley/bzr/send-hookage/bzrlib/plugin.py", line 453, in
test_suite
    return self.module.test_suite()
  File "/home/abentley/.bazaar/plugins/xmloutput/__init__.py", line 468,
in test_suite
    import tests
  File "/home/abentley/.bazaar/plugins/xmloutput/tests/__init__.py",
line 22, in <module>
    from bzrlib.tests import (
ImportError: cannot import name adapt_modules

bzr 1.13dev on python 2.5.2 (linux2)

This error happened because xmloutput imports adapt_modules and Robert
has removed it.

But it turns out it doesn't use it.  It also imports TestSuite and
iter_suite_tests, even though it doesn't use them, either.

So this patch deletes them and reformats the import slightly.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkm1BCUACgkQ0F+nu1YWqI1LowCfVrgJYqkJiPNPbE2FyegxvLVG
WY4An0l7s6TwmCvPM4r1V4T19lSn2MFK
=5L7I
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xmloutput-121.patch
Type: text/x-patch
Size: 2657 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090309/4e1e6460/attachment.bin