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/scoped_nodes.py | |
| parent | e77330972504ee1fa1ddd21124f10980c366eb60 (diff) | |
| download | astroid-10e71ccec84165b761c1e41921ff6c5b182f1e64.tar.gz | |
Fix most obvious errors intorduced by the latest merge
Diffstat (limited to 'astroid/scoped_nodes.py')
| -rw-r--r-- | astroid/scoped_nodes.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index fbe5875..1ac925f 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -1063,7 +1063,7 @@ def get_wrapping_class(node): -class Class(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin): +class ClassDef(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin): # some of the attributes below are set by the builder module or # by a raw factories @@ -1554,13 +1554,7 @@ class Class(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin): inferred = next(assignment.infer()) except exceptions.InferenceError: return -<<<<<<< variant A - if inferred is bases.YES: # don't expose this ->>>>>>> variant B - if infered is util.YES: # don't expose this -####### Ancestor - if infered is bases.YES: # don't expose this -======= end + if inferred is util.YES: # don't expose this return None return inferred |