[Pkg-bazaar-commits] ./bzr-gtk/unstable r405: Merged with mainline.

[Daniel Schierbeck]

------------------------------------------------------------
revno: 405
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: menubar
timestamp: Fri 2007-11-23 00:15:32 +0100
message:
  Merged with mainline.
modified:
  __init__.py
    ------------------------------------------------------------
    revno: 330.6.3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: gtk
    timestamp: Thu 2007-11-22 10:28:53 -0500
    message:
      Stop pygtk complaint: pygtk.require() must be called before importing gtk
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 330.6.4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: gtk
    timestamp: Thu 2007-11-22 10:32:54 -0500
    message:
      Allow test suite to run without pygtk
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-11-21 21:26:28 +0000
+++ b/__init__.py	2007-11-22 23:15:32 +0000
@@ -699,6 +699,10 @@
     default_encoding = sys.getdefaultencoding()
     try:
         result = TestSuite()
+        try:
+            import_pygtk()
+        except errors.BzrCommandError:
+            return result
         result.addTest(tests.test_suite())
     finally:
         if sys.getdefaultencoding() != default_encoding: