Merge with default.

authorcpopa
changesetf63d926167f8
branchexception_context
phasepublic
hiddenno
parent revision#6dc470e56b9a Refactor checks by infering first the cause of the exception., #0753071d3982 Mark `file` as a bad function when using python 2, closes #8.
child revision#0f5891844356 Close branch exception_context, #f5464375f03e Merged in PCManticore/pylint/exception_context (pull request #77)
files modified by this revision
ChangeLog
checkers/base.py
doc/conf.py
# HG changeset patch
# User cpopa
# Date 1389616519 -7200
# Mon Jan 13 14:35:19 2014 +0200
# Branch exception_context
# Node ID f63d926167f8a01c71c2841556f66eed61f3663a
# Parent 6dc470e56b9a392598ee2cf9798367a92097bd82
# Parent 0753071d398225308ae74e4bde292fa2a156bb6f
Merge with default.

diff --git a/ChangeLog b/ChangeLog
@@ -9,10 +9,12 @@
1      * Add new warning, 'bad-reversed-sequence', for checking that the
2        reversed() builtin receive a sequence (implements __getitem__ and __len__,
3        without being a dict or a dict subclass) or an instance which implements
4        __reversed__.
5 
6 +    * Mark `file` as a bad function when using python2 (closes #8).
7 +
8      * Add new warning 'bad-exception-context', checking
9        that `raise ... from ...` uses a proper exception context
10        (None or an exception).
11 
12 
diff --git a/checkers/base.py b/checkers/base.py
@@ -53,10 +53,11 @@
13                      ('__reversed__', ))
14 
15  BAD_FUNCTIONS = ['map', 'filter', 'apply']
16  if sys.version_info < (3, 0):
17      BAD_FUNCTIONS.append('input')
18 +    BAD_FUNCTIONS.append('file')
19 
20  del re
21 
22  def in_loop(node):
23      """return True if the node is inside a kind of for loop"""
diff --git a/doc/conf.py b/doc/conf.py
@@ -39,20 +39,20 @@
24  # The master toctree document.
25  master_doc = 'index'
26 
27  # General information about the project.
28  project = u'Pylint'
29 -copyright = u'2013, Logilab and contributors'
30 +copyright = u'2013-2014, Logilab and contributors'
31 
32  # The version info for the project you're documenting, acts as replacement for
33  # |version| and |release|, also used in various other places throughout the
34  # built documents.
35  #
36  # The short X.Y version.
37 -version = '1.0.0'
38 +version = '1.1.0'
39  # The full version, including alpha/beta/rc tags.
40 -release = '1.0.0'
41 +release = '1.1.0'
42 
43  # The language for content autogenerated by Sphinx. Refer to documentation
44  # for a list of supported languages.
45  #language = None
46