Factorize checks and remove unused function

1 files changed, 6 insertions, 15 deletions

diff --git a/BibTeX.py b/BibTeX.py
index 1cf4db6..5528df0 100644
--- a/BibTeX.py
+++ b/BibTeX.py
@@ -77,10 +77,11 @@ class BibTeX:
                         ent[k] = cr[k]
 
             ent.resolve()
+        self.remove_unrequired()
+
+    def remove_unrequired(self):
         rk = config.REQUIRE_KEY
         if rk is None:
-            # hack: if no key is required, require "title", since every
-            # entry will have a title.
             rk = "title"
 
         for ent in self:
@@ -88,6 +89,9 @@ class BibTeX:
                 ent.check()
                 del self[ent.key]
 
+        for ent in self:
+            ent.check()
+
 
 class FileIter:
     def __init__(self, fname=None, file=None, it=None, string=None):
@@ -367,19 +371,6 @@ def parseFile(filename, result=None):
     p = Parser(f, {}, result)
     r = p.parse()
     r.resolve()
-    for e in r:
-        e.check()
-    return r
-
-
-def parseString(string, result=None):
-    """Helper function: parse BibTeX from a string"""
-    f = FileIter(string=string)
-    p = Parser(f, {}, result)
-    r = p.parse()
-    r.resolve()
-    for e in r:
-        e.check()
     return r
 
 if __name__ == '__main__':