summaryrefslogtreecommitdiff
path: root/pylint/test/functional
diff options
context:
space:
mode:
Diffstat (limited to 'pylint/test/functional')
-rw-r--r--pylint/test/functional/redefined_variable_type.py12
-rw-r--r--pylint/test/functional/redefined_variable_type.txt11
2 files changed, 17 insertions, 6 deletions
diff --git a/pylint/test/functional/redefined_variable_type.py b/pylint/test/functional/redefined_variable_type.py
index 2fdf4ad..d88a9e9 100644
--- a/pylint/test/functional/redefined_variable_type.py
+++ b/pylint/test/functional/redefined_variable_type.py
@@ -5,6 +5,11 @@
_OK = True
class MyClass(object):
+
+ class Klass(object):
+ def __init__(self):
+ self.var2 = 'var'
+
def __init__(self):
self.var = True
self.var1 = 2
@@ -22,6 +27,10 @@ class MyClass(object):
var2 = property(_getter, _setter)
def some_method(self):
+ def func():
+ var = 1
+ test = 'bar'
+ var = 'baz' # [redefined-variable-type]
self.var = 1
test = 'foo'
myint = 2
@@ -29,7 +38,8 @@ class MyClass(object):
_OK = "This is OK" # [redefined-variable-type]
-SOME_FLOAT = 1.
+if _OK:
+ SOME_FLOAT = 1.
def dummy_function():
return 2
diff --git a/pylint/test/functional/redefined_variable_type.txt b/pylint/test/functional/redefined_variable_type.txt
index ff2c487..3646aeb 100644
--- a/pylint/test/functional/redefined_variable_type.txt
+++ b/pylint/test/functional/redefined_variable_type.txt
@@ -1,5 +1,6 @@
-redefined-variable-type:12:MyClass.__init__:Redefinition of self.var1 type from int to float
-redefined-variable-type:28:MyClass.some_method:Redefinition of myint type from int to bool
-redefined-variable-type:30::Redefinition of _OK type from bool to str
-redefined-variable-type:39:other_function:Redefinition of instance type from functional.redefined_variable_type.MyClass to bool
-redefined-variable-type:41::Redefinition of SOME_FLOAT type from float to int
+redefined-variable-type:17:MyClass.__init__:Redefinition of self.var1 type from int to float
+redefined-variable-type:33:MyClass.some_method.func:Redefinition of var type from int to str
+redefined-variable-type:37:MyClass.some_method:Redefinition of myint type from int to bool
+redefined-variable-type:39::Redefinition of _OK type from bool to str
+redefined-variable-type:49:other_function:Redefinition of instance type from functional.redefined_variable_type.MyClass to bool
+redefined-variable-type:51::Redefinition of SOME_FLOAT type from float to int