Rev 6390: (jelmer) Fix the "bzr bash-completion" command after migration to absolute in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6390 [merge]
revision-id: pqm at pqm.ubuntu.com-20111220182239-wi7jfqqrxj76f0w9
parent: pqm at pqm.ubuntu.com-20111220143836-170sokw0ugkthh1t
parent: jelmer at samba.org-20111220175621-w5jz1tn64qfkqp1m
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-12-20 18:22:39 +0000
message:
  (jelmer) Fix the "bzr bash-completion" command after migration to absolute
   paths. (Jelmer Vernooij)
modified:
  bzrlib/plugins/bash_completion/bashcomp.py bzr-20090930204816-30t9rmd0lpi17536-1
  bzrlib/plugins/bash_completion/tests/test_bashcomp.py test_bashcomp.py-20100429205005-o3im24mr5pdqog19-3
=== modified file 'bzrlib/plugins/bash_completion/bashcomp.py'
--- a/bzrlib/plugins/bash_completion/bashcomp.py	2011-12-18 15:28:38 +0000
+++ b/bzrlib/plugins/bash_completion/bashcomp.py	2011-12-20 17:56:21 +0000
@@ -28,6 +28,7 @@
 )
 import bzrlib
 import re
+import sys
 
 
 class BashCodeGen(object):
@@ -432,8 +433,6 @@
         ]
 
     def run(self, **kwargs):
-        import sys
-        from bashcomp import bash_completion_function
         if 'plugin' in kwargs:
             # work around bug #387117 which prevents us from using param_name
             if len(kwargs['plugin']) > 0:
@@ -444,7 +443,6 @@
 
 if __name__ == '__main__':
 
-    import sys
     import locale
     import optparse
 

=== modified file 'bzrlib/plugins/bash_completion/tests/test_bashcomp.py'
--- a/bzrlib/plugins/bash_completion/tests/test_bashcomp.py	2011-01-28 10:28:35 +0000
+++ b/bzrlib/plugins/bash_completion/tests/test_bashcomp.py	2011-12-19 16:08:00 +0000
@@ -21,7 +21,6 @@
 from bzrlib.tests import features
 from bzrlib.plugins.bash_completion.bashcomp import *
 
-import os
 import subprocess
 
 
@@ -325,3 +324,9 @@
                 self.assertSubset(['2a'], opt.registry_keys)
                 return
         raise AssertionError('Option --format not found')
+
+
+class BlackboxTests(tests.TestCase):
+
+    def test_bash_completion(self):
+        self.run_bzr("bash-completion")