diff mbox

[04/16] qapi: Eliminate superfluous QAPISchema attribute include_hist

Message ID 1434120674-8122-5-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster June 12, 2015, 2:51 p.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Eric Blake June 12, 2015, 11:11 p.m. UTC | #1 
On 06/12/2015 08:51 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  scripts/qapi.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Ah, I see - you're changing it from an object member to a local variable
(because it didn't need to persist beyond the one function).

Reviewed-by: Eric Blake <eblake@redhat.com>
Markus Armbruster June 16, 2015, 8:43 a.m. UTC | #2 
Eric Blake <eblake@redhat.com> writes:

> On 06/12/2015 08:51 AM, Markus Armbruster wrote:
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  scripts/qapi.py | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>
> Ah, I see - you're changing it from an object member to a local variable
> (because it didn't need to persist beyond the one function).

Exactly.

I could explain it the commit message, but I think I'll just squash it
into PATCH 07.

> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks!
diff mbox

Patch

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 683669e..baa60a5 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -110,7 +110,7 @@  class QAPISchema:
         if input_relname is None:
             input_relname = fp.name
         self.input_file = input_relname
-        self.include_hist = include_hist + [(input_relname, input_fname)]
+        include_hist = include_hist + [(input_relname, input_fname)]
         previously_included.append(input_fname)
         self.parent_info = parent_info
         self.src = fp.read()
@@ -135,7 +135,7 @@  class QAPISchema:
                                         % include)
                 include_path = os.path.join(os.path.dirname(input_fname),
                                             include)
-                for elem in self.include_hist:
+                for elem in include_hist:
                     if include_path == elem[1]:
                         raise QAPIExprError(expr_info, "Inclusion loop for %s"
                                             % include)
@@ -147,7 +147,7 @@  class QAPISchema:
                 except IOError, e:
                     raise QAPIExprError(expr_info,
                                         '%s: %s' % (e.strerror, include))
-                exprs_include = QAPISchema(fobj, include, self.include_hist,
+                exprs_include = QAPISchema(fobj, include, include_hist,
                                            previously_included, expr_info)
                 self.exprs.extend(exprs_include.exprs)
             else: