remove deprecated --username option to 'buildbot sendchange'

buildbot · Nov 12, 2011 · 93712b4 · 93712b4
1 parent 75e30c2
commit 93712b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/master/buildbot/scripts/runner.py b/master/buildbot/scripts/runner.py
@@ -768,7 +768,6 @@ def __init__(self):
         ("master", "m", None,
          "Location of the buildmaster's PBListener (host:port)"),
         # deprecated in 0.8.3; remove in 0.8.5 (bug #1711)
-        ("username", "u", None, "deprecated name for --who"),
         ("auth", "a", None, "Authentication token - username:password, or prompt for password"),
         ("who", "W", None, "Author of the commit"),
         ("repository", "R", '', "Repository specifier"),
@@ -793,8 +792,6 @@ def __init__(self):
     buildbotOptions = [
         [ 'master', 'master' ],
         [ 'who', 'who' ],
-        # deprecated in 0.8.3; remove in 0.8.5 (bug #1711)
-        [ 'username', 'username' ],
         [ 'branch', 'branch' ],
         [ 'category', 'category' ],
         [ 'vc', 'vc' ],
@@ -816,9 +813,6 @@ def sendchange(config, runReactor=False):
 
     encoding = config.get('encoding', 'utf8')
     who = config.get('who')
-    if not who and config.get('username'):
-        print "NOTE: --username/-u is deprecated: use --who/-W'"
-        who = config.get('username')
     auth = config.get('auth')
     master = config.get('master')
     branch = config.get('branch')

diff --git a/master/buildbot/test/unit/test_scripts_runner.py b/master/buildbot/test/unit/test_scripts_runner.py
@@ -182,16 +182,6 @@ def check(_):
         d.addCallback(check)
         return d
 
-    def test_sendchange_deprecated_username(self):
-        d = runner.sendchange(dict(username='me', master='a:1'))
-        def check(_):
-            self.assertEqual((self.sender.master, self.sender.auth,
-                    self.sender.encoding, self.sender.send_kwargs['who']),
-                    ('a:1', ['change','changepw'], 'utf8', 'me'))
-            self.assertIn('is deprecated', self.stdout.getvalue())
-        d.addCallback(check)
-        return d
-
     def test_sendchange_revision_file(self):
         open('rf', 'w').write('abcd')
         d = runner.sendchange(dict(who='me', master='a:1', revision_file='rf'))

diff --git a/master/docs/release-notes.rst b/master/docs/release-notes.rst
@@ -17,6 +17,9 @@ Deprecations, Removals, and Non-Compatible Changes
 * ``buildbot start`` no longer invokes make if a ``Makefile.buildbot`` exists.
   If you are using this functionality, consider invoking make directly.
 
+* The ``buildbot sendchange`` option ``--username`` has been removed as
+  promised in bug #1711.
+
 Features
 ~~~~~~~~