The find_content function expected a 'project' parameter but never
actually used it. Remove it and clean up tests accordingly.

Signed-off-by: Stephen Finucane <step...@that.guru>
Cc: Paul Jakma <p...@jakma.org>
Cc: Tom Rini <tr...@konsulko.com>
---
 patchwork/parser.py            |  4 ++--
 patchwork/tests/test_parser.py | 31 ++++++++++---------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/patchwork/parser.py b/patchwork/parser.py
index c7890ea..2df9278 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -342,7 +342,7 @@ def parse_version(subject, subject_prefixes):
     return 1
 
 
-def find_content(project, mail):
+def find_content(mail):
     """Extract a comment and potential diff from a mail."""
     patchbuf = None
     commentbuf = ''
@@ -761,7 +761,7 @@ def parse_mail(mail, list_id=None):
 
     # parse content
 
-    diff, message = find_content(project, mail)
+    diff, message = find_content(mail)
 
     if not (diff or message):
         return  # nothing to work with
diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/test_parser.py
index 96166ad..e4a379d 100644
--- a/patchwork/tests/test_parser.py
+++ b/patchwork/tests/test_parser.py
@@ -62,7 +62,7 @@ def read_mail(filename, project=None):
             mail = email.message_from_file(f)
     if 'Message-Id' not in mail:
         mail['Message-Id'] = make_msgid()
-    if project is not None:
+    if project:
         mail['List-Id'] = project.listid
     return mail
 
@@ -89,12 +89,9 @@ def parse_mail(*args, **kwargs):
 
 class PatchTest(TestCase):
 
-    def setUp(self):
-        self.project = create_project()
-
     def _find_content(self, mbox_filename):
-        mail = read_mail(mbox_filename, project=self.project)
-        diff, message = find_content(self.project, mail)
+        mail = read_mail(mbox_filename)
+        diff, message = find_content(mail)
 
         return diff, message
 
@@ -106,9 +103,7 @@ class InlinePatchTest(PatchTest):
 
     def setUp(self):
         email = create_email(self.orig_content + '\n' + self.orig_diff)
-
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
     def test_patch_content(self):
         self.assertEqual(self.diff, self.orig_diff)
@@ -130,8 +125,7 @@ class AttachmentPatchTest(InlinePatchTest):
         msg.attach(attachment)
         email = _create_email(msg)
 
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
 
 class AttachmentXDiffPatchTest(AttachmentPatchTest):
@@ -148,8 +142,7 @@ class UTF8InlinePatchTest(InlinePatchTest):
                        _charset='utf-8')
         email = _create_email(msg)
 
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
 
 class NoCharsetInlinePatchTest(InlinePatchTest):
@@ -160,8 +153,7 @@ class NoCharsetInlinePatchTest(InlinePatchTest):
         del email['Content-Type']
         del email['Content-Transfer-Encoding']
 
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
 
 class SignatureCommentTest(InlinePatchTest):
@@ -172,8 +164,7 @@ class SignatureCommentTest(InlinePatchTest):
         email = create_email(self.orig_content + '\n-- \nsig\n' +
                              self.orig_diff)
 
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
 
 class UpdateSigCommentTest(SignatureCommentTest):
@@ -194,8 +185,7 @@ class ListFooterTest(InlinePatchTest):
             'Linuxppc-dev mailing list',
             self.orig_diff]))
 
-        self.project = create_project()
-        self.diff, self.content = find_content(self.project, email)
+        self.diff, self.content = find_content(email)
 
 
 class DiffWordInCommentTest(InlinePatchTest):
@@ -571,8 +561,7 @@ class PatchParseTest(PatchTest):
         self.assertEqual(diff.count("\nrename to "), 2)
 
     def test_git_rename_with_diff(self):
-        diff, message = self._find_content(
-            '0009-git-rename-with-diff.mbox')
+        diff, message = self._find_content('0009-git-rename-with-diff.mbox')
         self.assertTrue(diff is not None)
         self.assertTrue(message is not None)
         self.assertEqual(diff.count("\nrename from "), 2)
-- 
2.9.3

_______________________________________________
Patchwork mailing list
Patchwork@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/patchwork

Reply via email to