diff options
| author | cpopa <devnull@localhost> | 2013-08-02 12:26:46 +0300 |
|---|---|---|
| committer | cpopa <devnull@localhost> | 2013-08-02 12:26:46 +0300 |
| commit | 1f5d694f0af58af8c5a6032dc4d57b08653500d5 (patch) | |
| tree | f173b15a7b4f77b8ec88d5760ccdde473716afb0 | |
| parent | d0f09414200182eb4202d78af9e1e37314a36843 (diff) | |
| download | pylint-1f5d694f0af58af8c5a6032dc4d57b08653500d5.tar.gz | |
Proper conflict fix.
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -79,7 +79,7 @@ ChangeLog for Pylint * Added a new warning 'old-raise-syntax' for the deprecated syntax raise Exception, args - * Support for PEP 3102 and new missing-kwoa (E1125) message for missing + * Support for PEP 3102 and new missing-kwoa (E1125) message for missing mandatory keyword argument (logilab.org's #107788) * Fix spelling of max-branchs option, now max-branches @@ -96,12 +96,14 @@ ChangeLog for Pylint containers like tuple * bitbucket #16: fix False positive E1003 on Python 3 for argument-less super() - + * bitbucket #6: put back documentation in source distribution * bitbucket #15: epylint shouldn't hang anymore when there is a large output on pylint'stderr + * bitbucket #7: fix epylint w/ python3 + * bitbucket #3: remove string module from the default list of deprecated modules |