Merge lp:~jelmer/bzr-builddeb/fix-import-warnings into lp:bzr-builddeb

[Jelmer Vernooij]

Fix two more deprecation warnings from the bzr-builddeb testsuite.

[lp:~jelmer/bzr-builddeb/fix-import-warnings]

465. By James Westby on 2010-07-30

Try importing from debian first. Thanks Jelmer.

=== modified file 'tests/blackbox/test_do.py'
--- tests/blackbox/test_do.py	2009-02-18 18:36:18 +0000
+++ tests/blackbox/test_do.py	2010-07-30 01:27:49 +0000
@@ -1,6 +1,6 @@
 #    test_do.py -- Blackbox tests for bd-do.
 #    Copyright (C) 2007 James Westby <[e-mail]>
-#    
+#
 #    This file is part of bzr-builddeb.
 #
 #    bzr-builddeb is free software; you can redistribute it and/or modify
@@ -21,9 +21,16 @@
 import os
 import tarfile
 
-from debian_bundle.changelog import (Changelog,
-                                     Version,
-                                     )
+try:
+    from debian.changelog import (Changelog,
+                                  Version,
+                                  )
+except ImportError:
+    # Prior to 0.1.15 the debian module was called debian_bundle
+    from debian_bundle.changelog import (Changelog,
+                                         Version,
+                                        )
+
 
 from bzrlib.tests.blackbox import ExternalBase
 

=== modified file 'tests/blackbox/test_import_upstream.py'
--- tests/blackbox/test_import_upstream.py	2010-05-28 00:36:04 +0000
+++ tests/blackbox/test_import_upstream.py	2010-07-30 01:27:49 +0000
@@ -19,7 +19,11 @@
 
 """Tests for import-upstream."""
 
-from debian_bundle.changelog import Version
+try:
+    from debian.changelog import Version
+except ImportError:
+    # Prior to 0.1.15 the debian module was called debian_bundle
+    from debian_bundle.changelog import Version
 
 from bzrlib.plugins.builddeb.tests.blackbox.test_import_dsc import TestBaseImportDsc
 from bzrlib.plugins.builddeb.tests.test_import_dsc import PristineTarFeature