diff options
Diffstat (limited to 'src/python/m5/util')
| -rw-r--r-- | src/python/m5/util/code_formatter.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/python/m5/util/code_formatter.py b/src/python/m5/util/code_formatter.py index 396fe0e52..47106e0d9 100644 --- a/src/python/m5/util/code_formatter.py +++ b/src/python/m5/util/code_formatter.py @@ -55,15 +55,14 @@ class lookup(object): if item == '__line__': return self.frame.f_lineno + if self.formatter.locals and item in self.frame.f_locals: + return self.frame.f_locals[item] + if item in self.dict: return self.dict[item] - if self.formatter.locals or self.formatter.globals: - if self.formatter.locals and item in self.frame.f_locals: - return self.frame.f_locals[item] - - if self.formatter.globals and item in self.frame.f_globals: - return self.frame.f_globals[item] + if self.formatter.globals and item in self.frame.f_globals: + return self.frame.f_globals[item] if item in __builtin__.__dict__: return __builtin__.__dict__[item] @@ -124,7 +123,7 @@ class code_formatter(object): self._dict = {} self._indent_level = 0 self._indent_spaces = 4 - self.globals = kwargs.pop('globals',type(self).globals) + self.globals = kwargs.pop('globals', type(self).globals) self.locals = kwargs.pop('locals', type(self).locals) self._fix_newlines = \ kwargs.pop('fix_newlines', type(self).fix_newlines) |