From 2ec90bb490c047ce3aa10b84cb7c7b924cc17a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Thu, 2 Jul 2020 00:48:03 +0200
Subject: [PATCH] remove support for rewriting to txt

---
 fdroidserver/rewritemeta.py |  6 ++--
 tests/rewritemeta.TestCase  | 65 ++++++-------------------------------
 2 files changed, 12 insertions(+), 59 deletions(-)

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 97d15852..82763c54 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 # rewritemeta.py - part of the FDroid server tools
-# This cleans up the original .txt metadata file format.
+# This cleans up the original .yml metadata file format.
 # Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@ config = None
 options = None
 
 
-SUPPORTED_FORMATS = ['txt', 'yml']
+SUPPORTED_FORMATS = ['yml']
 
 
 def proper_format(app):
@@ -42,8 +42,6 @@ def proper_format(app):
     _ignored, extension = common.get_extension(app.metadatapath)
     if extension == 'yml':
         metadata.write_yaml(s, app)
-    elif extension == 'txt':
-        metadata.write_txt(s, app)
     content = s.getvalue()
     s.close()
     return content == cur_content
diff --git a/tests/rewritemeta.TestCase b/tests/rewritemeta.TestCase
index 664f3c78..8a7d41e4 100755
--- a/tests/rewritemeta.TestCase
+++ b/tests/rewritemeta.TestCase
@@ -49,48 +49,13 @@ class RewriteMetaTest(unittest.TestCase):
 
         with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
             os.mkdir('metadata')
-            with open('metadata/a.txt', 'w') as f:
-                f.write('Auto Name:a')
+            with open('metadata/a.yml', 'w') as f:
+                f.write('AutoName: a')
             with open('metadata/b.yml', 'w') as f:
                 f.write('AutoName: b')
 
             rewritemeta.main()
 
-            with open('metadata/a.txt') as f:
-                self.assertEqual(f.read(), textwrap.dedent('''\
-                    Categories:
-                    License:Unknown
-                    Web Site:
-                    Source Code:
-                    Issue Tracker:
-
-                    Auto Name:a
-
-                    Auto Update Mode:None
-                    Update Check Mode:None
-                    '''))
-
-            with open('metadata/b.yml') as f:
-                self.assertEqual(f.read(), textwrap.dedent('''\
-                    License: Unknown
-
-                    AutoName: b
-
-                    AutoUpdateMode: None
-                    UpdateCheckMode: None
-                    '''))
-
-    def test_rewrite_scenario_txt_to_yml(self):
-
-        sys.argv = ['rewritemeta', '--to', 'yml', 'a']
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('metadata')
-            with open('metadata/a.txt', 'w') as f:
-                f.write('Auto Name:a')
-
-            rewritemeta.main()
-
             with open('metadata/a.yml') as f:
                 self.assertEqual(f.read(), textwrap.dedent('''\
                     License: Unknown
@@ -101,25 +66,15 @@ class RewriteMetaTest(unittest.TestCase):
                     UpdateCheckMode: None
                     '''))
 
-    def test_rewrite_scenario_txt_to_yml_no_ruamel(self):
-
-        sys.argv = ['rewritemeta', '--to', 'yml', 'a']
-
-        with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
-            os.mkdir('metadata')
-            with open('metadata/a.txt', 'w') as f:
-                f.write('Auto Name:a')
-
-            def boom(*args):
-                raise FDroidException(' '.join((str(x) for x in args)))
-
-            with mock.patch('fdroidserver.metadata.write_yaml', boom):
-                with self.assertRaises(FDroidException):
-                    rewritemeta.main()
-
-            with open('metadata/a.txt') as f:
+            with open('metadata/b.yml') as f:
                 self.assertEqual(f.read(), textwrap.dedent('''\
-                    Auto Name:a'''))
+                    License: Unknown
+
+                    AutoName: b
+
+                    AutoUpdateMode: None
+                    UpdateCheckMode: None
+                    '''))
 
     def test_rewrite_scenario_yml_no_ruamel(self):
         sys.argv = ['rewritemeta', 'a']