Merge with default.

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5406b18..868ad60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ ChangeLog for Pylint
       without being a dict or a dict subclass) or an instance which implements
       __reversed__.
 
+    * Mark `file` as a bad function when using python2 (closes #8).
+
     * Add new warning 'bad-exception-context', checking
       that `raise ... from ...` uses a proper exception context
       (None or an exception).
diff --git a/checkers/base.py b/checkers/base.py
index cf4304c..55e5f36 100644
--- a/checkers/base.py
+++ b/checkers/base.py
@@ -55,6 +55,7 @@ REVERSED_METHODS = (('__getitem__', '__len__'),
 BAD_FUNCTIONS = ['map', 'filter', 'apply']
 if sys.version_info < (3, 0):
     BAD_FUNCTIONS.append('input')
+    BAD_FUNCTIONS.append('file')
 
 del re
 
diff --git a/doc/conf.py b/doc/conf.py
index 3aaf613..b4b8fbd 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Pylint'
-copyright = u'2013, Logilab and contributors'
+copyright = u'2013-2014, Logilab and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.0'
+version = '1.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.