qapi: Eliminate superfluous QAPISchema attribute input_dir

Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
mujehoxe · Jun 18, 2015 · 12c7079 · 12c7079
1 parent 836c3b0
commit 12c7079
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/qapi.py b/scripts/qapi.py
@@ -109,7 +109,6 @@ def __init__(self, fp, input_relname=None, include_hist=[],
         input_fname = os.path.abspath(fp.name)
         if input_relname is None:
             input_relname = fp.name
-        self.input_dir = os.path.dirname(input_fname)
         self.input_file = input_relname
         self.include_hist = include_hist + [(input_relname, input_fname)]
         previously_included.append(input_fname)
@@ -134,7 +133,8 @@ def __init__(self, fp, input_relname=None, include_hist=[],
                     raise QAPIExprError(expr_info,
                                         'Expected a file name (string), got: %s'
                                         % include)
-                include_path = os.path.join(self.input_dir, include)
+                include_path = os.path.join(os.path.dirname(input_fname),
+                                            include)
                 for elem in self.include_hist:
                     if include_path == elem[1]:
                         raise QAPIExprError(expr_info, "Inclusion loop for %s"