diff options
author | Ceridwen <ceridwenv@gmail.com> | 2015-08-14 15:38:35 -0400 |
---|---|---|
committer | Ceridwen <ceridwenv@gmail.com> | 2015-08-14 15:38:35 -0400 |
commit | 10e71ccec84165b761c1e41921ff6c5b182f1e64 (patch) | |
tree | df04d0a75ac6241ba49632cb7665dbbc65ec1c50 /astroid/objects.py | |
parent | e77330972504ee1fa1ddd21124f10980c366eb60 (diff) | |
download | astroid-10e71ccec84165b761c1e41921ff6c5b182f1e64.tar.gz |
Fix most obvious errors intorduced by the latest merge
Diffstat (limited to 'astroid/objects.py')
-rw-r--r-- | astroid/objects.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/astroid/objects.py b/astroid/objects.py index a78dcb4..056e2d2 100644 --- a/astroid/objects.py +++ b/astroid/objects.py @@ -53,15 +53,9 @@ class FrozenSet(bases.NodeNG, bases.Instance, mixins.ParentAssignTypeMixin): if elts is None: node.elts = [] else: - node.elts = [const_factory(e) for e in elts] + node.elts = [node_classes.const_factory(e) for e in elts] return node - def __init__(self, elts=None): - if elts is None: - self.elts = [] - else: - self.elts = [node_classes.const_factory(e) for e in elts] - def pytype(self): return '%s.frozenset' % BUILTINS @@ -117,8 +111,8 @@ class Super(bases.NodeNG): if isinstance(self.type, scoped_nodes.ClassDef): # `super(type, type)`, most likely in a class method. - self._class_based = True - mro_type = self.type + self._class_based = True + mro_type = self.type else: mro_type = getattr(self.type, '_proxied', None) if not isinstance(mro_type, (bases.Instance, scoped_nodes.ClassDef)): |