Merge branch 'pr-100'

Petr · Petr · commit ad9a33a327ea · 2017-09-01T11:33:05.000-04:00
PR: pylint-dev#100
diff --git a/pylint_django/transforms/transforms/django_utils_translation.py b/pylint_django/transforms/transforms/django_utils_translation.py
@@ -1 +1,2 @@
-ugettext_lazy = lambda x: None
+# ugettext_lazy is supposed to return six.text_type
+ugettext_lazy = lambda x: str
diff --git a/test/input/func_noerror_ugettext_lazy_format.py b/test/input/func_noerror_ugettext_lazy_format.py
@@ -0,0 +1,7 @@
+"""
+Checks that Pylint does not complain about django lazy proxy
+when using ugettext_lazy
+"""
+from django.utils.translation import ugettext_lazy
+
+ugettext_lazy('{something}').format(something='lala')

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-ugettext_lazy = lambda x: None`
	`1`	`+# ugettext_lazy is supposed to return six.text_type`
	`2`	`+ugettext_lazy = lambda x: str`