#342 Remove sys.stdin.isatty

martinmacko47 · Jan 21, 2021 · f9ba598 · f9ba598
1 parent 537cd1d
commit f9ba598
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/chcemvediet/apps/anonymization/management/commands/attachment_anonymization.py b/chcemvediet/apps/anonymization/management/commands/attachment_anonymization.py
@@ -73,10 +73,10 @@ def handle(self, *args, **options):
                     content = file.read()
             except IOError as e:
                 raise CommandError(u'Could not open file: {}.'.format(e))
-        elif not sys.stdin.isatty():
-            content = sys.stdin.read()
         else:
-            raise CommandError(u'Missing content source.')
+            content = sys.stdin.read()
+            if not content:
+                raise CommandError(u'No content given.')
 
         attachments_finalization.delete()
         AttachmentFinalization.objects.create(

diff --git a/chcemvediet/apps/anonymization/tests/test_management_commands.py b/chcemvediet/apps/anonymization/tests/test_management_commands.py
@@ -62,7 +62,9 @@ def test_content_is_read_from_stdin_if_file_argument_is_omitted(self):
         self.assertEqual(attachment_finalization.file.read(), u'Content from stdin.')
 
     def test_file_argument_and_stdin_together_may_not_be_omitted(self):
-        with self.assertRaisesMessage(CommandError, u'Missing content source.'):
+        self.addCleanup(setattr, sys, u'stdin', sys.stdin)
+        sys.stdin = StringIO(u'')
+        with self.assertRaisesMessage(CommandError, u'No content given.'):
             call_command(u'attachment_anonymization', self.attachment.pk)
 
     def test_preferred_content_source_is_file(self):