From 13417c18e443b3c594c0db37820ba06106300879 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sat, 2 Jul 2016 20:00:16 +0000
Subject: [PATCH] hint-tester: Use hint-parser for parsing excuse hints

Signed-off-by: Niels Thykier <niels@thykier.net>
---
 britney.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/britney.py b/britney.py
index 3e441c1..55630cb 100755
--- a/britney.py
+++ b/britney.py
@@ -281,11 +281,12 @@ class Britney(object):
         self.binaries = {}
         self.all_selected = []
         self.excuses = {}
+        self._hint_parser = HintParser(self)
 
         try:
-            self.hints = self.read_hints(self.options.hintsdir)
+            self.read_hints(self.options.hintsdir)
         except AttributeError:
-            self.hints = self.read_hints(os.path.join(self.options.unstable, 'Hints'))
+            self.read_hints(os.path.join(self.options.unstable, 'Hints'))
 
         if self.options.nuninst_cache:
             self.log("Not building the list of non-installable packages, as requested", type="I")
@@ -493,6 +494,10 @@ class Britney(object):
         self.policies.append(AgePolicy(self.options, MINDAYS))
         self.policies.append(RCBugPolicy(self.options))
 
+    @property
+    def hints(self):
+        return self._hint_parser.hints
+
     def log(self, msg, type="I"):
         """Print info messages according to verbosity level
         
@@ -1030,13 +1035,12 @@ class Britney(object):
         The method returns a dictionary where the key is the command, and
         the value is the list of affected packages.
         """
-        hint_parser = HintParser(self)
 
         for who in self.HINTS.keys():
             if who == 'command-line':
                 lines = self.options.hints and self.options.hints.split(';') or ()
                 filename = '<cmd-line>'
-                hint_parser.parse_hints(who, self.HINTS[who], filename, lines)
+                self._hint_parser.parse_hints(who, self.HINTS[who], filename, lines)
             else:
                 filename = os.path.join(hintsdir, who)
                 if not os.path.isfile(filename):
@@ -1044,9 +1048,9 @@ class Britney(object):
                     continue
                 self.log("Loading hints list from %s" % filename)
                 with open(filename, encoding='utf-8') as f:
-                    hint_parser.parse_hints(who, self.HINTS[who], filename, f)
+                    self._hint_parser.parse_hints(who, self.HINTS[who], filename, f)
 
-        hints = hint_parser.hints
+        hints = self._hint_parser.hints
 
         for x in ["block", "block-all", "block-udeb", "unblock", "unblock-udeb", "force", "urgent", "remove", "age-days"]:
             z = {}
@@ -1078,8 +1082,6 @@ class Britney(object):
         if len(hints["block"]) == 0 and len(hints["block-udeb"]) == 0:
             self.log("WARNING: No block hints at all, not even udeb ones!", type="W")
 
-        return hints
-
 
     # Utility methods for package analysis
     # ------------------------------------
@@ -2804,7 +2806,7 @@ class Britney(object):
             elif user_input and user_input[0] in ('remove', 'approve', 'urgent', 'age-days',
                                         'block', 'block-udeb', 'unblock', 'unblock-udeb',
                                         'block-all', 'force'):
-                self.hints.add_hint('hint-tester', ' '.join(user_input))
+                self._hint_parser.parse_hints('hint-tester', Britney.HINTS_ALL, '<stdin>', [' '.join(user_input)])
                 self.write_excuses()
             # run a hint
             elif user_input and user_input[0] in ('easy', 'hint', 'force-hint'):