From b5742da44af82b46fe5f8555232f408b66d5526c Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Thu, 1 Jun 2017 22:37:37 +0200
Subject: [PATCH] [diff_branches] remove the broken --format option

It doesn't work as expected ('r', 's', or 't' instead of 'rst') and we
only provide one option anyway.

Change-Id: I4300264d7f919fb2041b10ee5d9f6e246c443377
---
 autogenerate_config_docs/diff_branches.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/autogenerate_config_docs/diff_branches.py b/autogenerate_config_docs/diff_branches.py
index 356df50..5b8ee08 100755
--- a/autogenerate_config_docs/diff_branches.py
+++ b/autogenerate_config_docs/diff_branches.py
@@ -251,13 +251,6 @@ def main():
                         required=False,
                         default='.',
                         type=str,)
-    parser.add_argument('-f', '--format',
-                        dest='format',
-                        help='Output format (rst).',
-                        required=False,
-                        default='rst',
-                        type=str,
-                        choices=('rst'),)
     parser.add_argument('-n', '--no-venv-update',
                         dest='novenvupdate',
                         help='Don\'t update the virtual envs.',
@@ -275,10 +268,9 @@ def main():
 
         release = args.new_branch.replace('stable/', '')
         env = get_env(project, release, old_list, new_list)
-        ext = 'rst' if args.format == 'rst' else 'xml'
-        filename = ("%(project)s-conf-changes.%(ext)s" %
-                    {'project': project, 'ext': ext})
-        tmpl_file = 'templates/changes.%s.j2' % args.format
+        filename = ("%(project)s-conf-changes.rst" %
+                    {'project': project})
+        tmpl_file = 'templates/changes.rst.j2'
         if not os.path.exists(args.target):
             os.makedirs(args.target)
         dest = os.path.join(args.target, filename)