# HG changeset patch # User Paul Boddie # Date 1358202391 -3600 # Node ID c1c95a183e21ea32aea927b73bb071feceab14ee # Parent b41fb345cd8990bbe262c93f6afa43d154501121 Moved common logic into a separate method. diff -r b41fb345cd89 -r c1c95a183e21 micropython/data.py --- a/micropython/data.py Mon Jan 14 18:44:32 2013 +0100 +++ b/micropython/data.py Mon Jan 14 23:26:31 2013 +0100 @@ -1424,23 +1424,26 @@ # Attribute usage methods that apply to module globals in certain # circumstances. + def can_use_name_for_usage(self, name): + return name not in self.modified_names and not self.circular_import + def _use_attribute(self, name, attrname, value=None): - if name not in self.modified_names and not self.circular_import: + if self.can_use_name_for_usage(name): return NamespaceDict._use_attribute(self, name, attrname, value) else: self.importer.use_name(attrname, self.full_name(), value) return [] def _define_attribute_user_for_name(self, node, name): - if name not in self.modified_names and not self.circular_import: + if self.can_use_name_for_usage(name): NamespaceDict._define_attribute_user_for_name(self, node, name) def _init_attribute_user_for_name(self, node, name): - if name not in self.modified_names and not self.circular_import: + if self.can_use_name_for_usage(name): NamespaceDict._init_attribute_user_for_name(self, node, name) def _define_attribute_accessor(self, name, attrname, node, value): - if name not in self.modified_names and not self.circular_import: + if self.can_use_name_for_usage(name): NamespaceDict._define_attribute_accessor(self, name, attrname, node, value) else: self.importer.use_name(attrname, self.full_name(), value)