diff options
| author | Claudiu Popa <pcmanticore@gmail.com> | 2014-04-22 20:38:27 +0300 |
|---|---|---|
| committer | Claudiu Popa <pcmanticore@gmail.com> | 2014-04-22 20:38:27 +0300 |
| commit | 7d1269a88635cd5433be0c0cd425b98878fe323e (patch) | |
| tree | f8ee22addb3eef61575415be66a3b7dceff28298 | |
| parent | d49f2971afcbb271fc85496ed8fe8f6b42e7362f (diff) | |
| parent | 282ee5be047cddc860d70bb2ac40068cbd994b1b (diff) | |
| download | pylint-7d1269a88635cd5433be0c0cd425b98878fe323e.tar.gz | |
Merged logilab/pylint into default
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/conf.py | 4 | ||||
| -rw-r--r-- | doc/message-control.rst | 22 |
3 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index c52023c..fd43e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pylint (1.2.0-0) unstable; urgency=low +pylint (1.2.0-1) unstable; urgency=low * new upstream release diff --git a/doc/conf.py b/doc/conf.py index b4b8fbd..d89693e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,9 +48,9 @@ copyright = u'2013-2014, Logilab and contributors' # built documents. # # The short X.Y version. -version = '1.1.0' +from pylint.__pkginfo__ import version # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/message-control.rst b/doc/message-control.rst index d93b452..1929d73 100644 --- a/doc/message-control.rst +++ b/doc/message-control.rst @@ -22,34 +22,34 @@ An example available from the examples directory: def meth2(self, arg): """and this one not""" - # pylint: disable=W0613 + # pylint: disable=unused-argument print self\ + "foo" def meth3(self): """test one line disabling""" # no error - print self.bla # pylint: disable=E1101 + print self.bla # pylint: disable=no-member # error print self.blop def meth4(self): """test re-enabling""" - # pylint: disable=E1101 + # pylint: disable=no-member # no error print self.bla print self.blop - # pylint: enable=E1101 + # pylint: enable=no-member # error print self.blip def meth5(self): """test IF sub-block re-enabling""" - # pylint: disable=E1101 + # pylint: disable=no-member # no error print self.bla if self.blop: - # pylint: enable=E1101 + # pylint: enable=no-member # error print self.blip else: @@ -60,14 +60,14 @@ An example available from the examples directory: def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" - # pylint: disable=E1101 + # pylint: disable=no-member # no error print self.bla try: - pylint: enable=E1101 + pylint: enable=no-member # error print self.blip - except UndefinedName: # pylint: disable=E0602 + except UndefinedName: # pylint: disable=undefined-variable # no error print self.blip # no error @@ -75,7 +75,7 @@ An example available from the examples directory: def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=E1101 + if self.blop: # pylint: disable=no-member # error print self.blip else: @@ -89,7 +89,7 @@ An example available from the examples directory: """test late disabling""" # error print self.blip - # pylint: disable=E1101 + # pylint: disable=no-member # no error print self.bla print self.blop |