summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astroid/__init__.py6
-rw-r--r--astroid/__pkginfo__.py6
-rw-r--r--astroid/arguments.py5
-rw-r--r--astroid/as_string.py7
-rw-r--r--astroid/astpeephole.py4
-rw-r--r--astroid/bases.py7
-rw-r--r--astroid/brain/brain_builtin_inference.py5
-rw-r--r--astroid/brain/brain_collections.py4
-rw-r--r--astroid/brain/brain_dateutil.py5
-rw-r--r--astroid/brain/brain_functools.py4
-rw-r--r--astroid/brain/brain_gi.py4
-rw-r--r--astroid/brain/brain_hashlib.py4
-rw-r--r--astroid/brain/brain_mechanize.py4
-rw-r--r--astroid/brain/brain_multiprocessing.py4
-rw-r--r--astroid/brain/brain_namedtuple_enum.py5
-rw-r--r--astroid/brain/brain_nose.py4
-rw-r--r--astroid/brain/brain_numpy.py4
-rw-r--r--astroid/brain/brain_pkg_resources.py4
-rw-r--r--astroid/brain/brain_pytest.py5
-rw-r--r--astroid/brain/brain_qt.py4
-rw-r--r--astroid/brain/brain_six.py4
-rw-r--r--astroid/brain/brain_ssl.py4
-rw-r--r--astroid/brain/brain_subprocess.py4
-rw-r--r--astroid/brain/brain_threading.py4
-rw-r--r--astroid/builder.py7
-rw-r--r--astroid/context.py5
-rw-r--r--astroid/decorators.py10
-rw-r--r--astroid/exceptions.py7
-rw-r--r--astroid/helpers.py5
-rw-r--r--astroid/inference.py7
-rw-r--r--astroid/interpreter/__init__.py3
-rw-r--r--astroid/interpreter/objectmodel.py26
-rw-r--r--astroid/manager.py7
-rw-r--r--astroid/mixins.py6
-rw-r--r--astroid/modutils.py9
-rw-r--r--astroid/node_classes.py8
-rw-r--r--astroid/nodes.py7
-rw-r--r--astroid/objects.py5
-rw-r--r--astroid/protocols.py7
-rw-r--r--astroid/raw_building.py7
-rw-r--r--astroid/rebuilder.py7
-rw-r--r--astroid/scoped_nodes.py8
-rw-r--r--astroid/test_utils.py6
-rw-r--r--astroid/tests/__init__.py3
-rw-r--r--astroid/tests/resources.py5
-rw-r--r--astroid/tests/unittest_brain.py9
-rw-r--r--astroid/tests/unittest_builder.py7
-rw-r--r--astroid/tests/unittest_helpers.py5
-rw-r--r--astroid/tests/unittest_inference.py9
-rw-r--r--astroid/tests/unittest_lookup.py7
-rw-r--r--astroid/tests/unittest_manager.py6
-rw-r--r--astroid/tests/unittest_modutils.py8
-rw-r--r--astroid/tests/unittest_nodes.py8
-rw-r--r--astroid/tests/unittest_object_model.py25
-rw-r--r--astroid/tests/unittest_objects.py5
-rw-r--r--astroid/tests/unittest_peephole.py4
-rw-r--r--astroid/tests/unittest_protocols.py4
-rw-r--r--astroid/tests/unittest_python3.py6
-rw-r--r--astroid/tests/unittest_raw_building.py5
-rw-r--r--astroid/tests/unittest_regrtest.py6
-rw-r--r--astroid/tests/unittest_scoped_nodes.py9
-rw-r--r--astroid/tests/unittest_transforms.py5
-rw-r--r--astroid/tests/unittest_utils.py5
-rw-r--r--astroid/transforms.py4
-rw-r--r--astroid/util.py9
-rw-r--r--setup.py6
66 files changed, 237 insertions, 181 deletions
diff --git a/astroid/__init__.py b/astroid/__init__.py
index 30a37ff1..9c12eb65 100644
--- a/astroid/__init__.py
+++ b/astroid/__init__.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2013, 2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index bdffe25d..fe08afb9 100644
--- a/astroid/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/arguments.py b/astroid/arguments.py
index 6a1bc3c5..f81ccbd6 100644
--- a/astroid/arguments.py
+++ b/astroid/arguments.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/as_string.py b/astroid/as_string.py
index 888d849a..e84a755f 100644
--- a/astroid/as_string.py
+++ b/astroid/as_string.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2009-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/astpeephole.py b/astroid/astpeephole.py
index c9c440e3..dde5dca1 100644
--- a/astroid/astpeephole.py
+++ b/astroid/astpeephole.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/bases.py b/astroid/bases.py
index a3ea295e..314b7db0 100644
--- a/astroid/bases.py
+++ b/astroid/bases.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2009-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_builtin_inference.py b/astroid/brain/brain_builtin_inference.py
index 5e121cfa..717dc78c 100644
--- a/astroid/brain/brain_builtin_inference.py
+++ b/astroid/brain/brain_builtin_inference.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2014-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_collections.py b/astroid/brain/brain_collections.py
index df378af7..e1e10695 100644
--- a/astroid/brain/brain_collections.py
+++ b/astroid/brain/brain_collections.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_dateutil.py b/astroid/brain/brain_dateutil.py
index 3c14c72d..e9aafd25 100644
--- a/astroid/brain/brain_dateutil.py
+++ b/astroid/brain/brain_dateutil.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_functools.py b/astroid/brain/brain_functools.py
index 99fe3fa4..d71edebe 100644
--- a/astroid/brain/brain_functools.py
+++ b/astroid/brain/brain_functools.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
"""Astroid hooks for understanding functools library module."""
import astroid
diff --git a/astroid/brain/brain_gi.py b/astroid/brain/brain_gi.py
index 1bf35852..03c19c0a 100644
--- a/astroid/brain/brain_gi.py
+++ b/astroid/brain/brain_gi.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2013-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_hashlib.py b/astroid/brain/brain_hashlib.py
index 297e6a5d..aacd1743 100644
--- a/astroid/brain/brain_hashlib.py
+++ b/astroid/brain/brain_hashlib.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_mechanize.py b/astroid/brain/brain_mechanize.py
index cfcfdae4..afc65059 100644
--- a/astroid/brain/brain_mechanize.py
+++ b/astroid/brain/brain_mechanize.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2012-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_multiprocessing.py b/astroid/brain/brain_multiprocessing.py
index adbc779a..a19bac69 100644
--- a/astroid/brain/brain_multiprocessing.py
+++ b/astroid/brain/brain_multiprocessing.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_namedtuple_enum.py b/astroid/brain/brain_namedtuple_enum.py
index 2a5c17c4..774b987e 100644
--- a/astroid/brain/brain_namedtuple_enum.py
+++ b/astroid/brain/brain_namedtuple_enum.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2012-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2012-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_nose.py b/astroid/brain/brain_nose.py
index 1eed078e..cc8939bd 100644
--- a/astroid/brain/brain_nose.py
+++ b/astroid/brain/brain_nose.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_numpy.py b/astroid/brain/brain_numpy.py
index 675d72d3..8acfe053 100644
--- a/astroid/brain/brain_numpy.py
+++ b/astroid/brain/brain_numpy.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_pkg_resources.py b/astroid/brain/brain_pkg_resources.py
index cd3ade65..bd60ecd3 100644
--- a/astroid/brain/brain_pkg_resources.py
+++ b/astroid/brain/brain_pkg_resources.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_pytest.py b/astroid/brain/brain_pytest.py
index 065c9521..6d451f1e 100644
--- a/astroid/brain/brain_pytest.py
+++ b/astroid/brain/brain_pytest.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2014-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_qt.py b/astroid/brain/brain_qt.py
index 07224392..fb16dfb0 100644
--- a/astroid/brain/brain_qt.py
+++ b/astroid/brain/brain_qt.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_six.py b/astroid/brain/brain_six.py
index 6ec62d99..f16a2938 100644
--- a/astroid/brain/brain_six.py
+++ b/astroid/brain/brain_six.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2014-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_ssl.py b/astroid/brain/brain_ssl.py
index 6357c0dd..78c20c99 100644
--- a/astroid/brain/brain_ssl.py
+++ b/astroid/brain/brain_ssl.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_subprocess.py b/astroid/brain/brain_subprocess.py
index d81a8bc6..c198de22 100644
--- a/astroid/brain/brain_subprocess.py
+++ b/astroid/brain/brain_subprocess.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/brain/brain_threading.py b/astroid/brain/brain_threading.py
index e64174ce..f2dfe603 100644
--- a/astroid/brain/brain_threading.py
+++ b/astroid/brain/brain_threading.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/builder.py b/astroid/builder.py
index 8f9f8db0..a279ff8e 100644
--- a/astroid/builder.py
+++ b/astroid/builder.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2015 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/context.py b/astroid/context.py
index c2073a0a..f693d406 100644
--- a/astroid/context.py
+++ b/astroid/context.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/decorators.py b/astroid/decorators.py
index 8bfa06f2..1d31bb60 100644
--- a/astroid/decorators.py
+++ b/astroid/decorators.py
@@ -1,12 +1,10 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
-#
-# The code in this file was originally part of logilab-common, licensed under
-# the same license.
-
""" A few useful function/method decorators."""
import functools
diff --git a/astroid/exceptions.py b/astroid/exceptions.py
index 1bc1dfd7..bb05bc04 100644
--- a/astroid/exceptions.py
+++ b/astroid/exceptions.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2007, 2009-2010, 2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/helpers.py b/astroid/helpers.py
index 930c9dd5..62da56ea 100644
--- a/astroid/helpers.py
+++ b/astroid/helpers.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/inference.py b/astroid/inference.py
index 1e068997..5b69179a 100644
--- a/astroid/inference.py
+++ b/astroid/inference.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/interpreter/__init__.py b/astroid/interpreter/__init__.py
index e3e07d79..8b137891 100644
--- a/astroid/interpreter/__init__.py
+++ b/astroid/interpreter/__init__.py
@@ -1,2 +1 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
diff --git a/astroid/interpreter/objectmodel.py b/astroid/interpreter/objectmodel.py
index b75218b2..6de6e4b1 100644
--- a/astroid/interpreter/objectmodel.py
+++ b/astroid/interpreter/objectmodel.py
@@ -1,26 +1,6 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
-# copyright 2003-2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
-# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
-#
-# This file is part of astroid.
-#
-# astroid is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation, either version 2.1 of the License, or (at your
-# option) any later version.
-#
-# astroid is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with astroid. If not, see <http://www.gnu.org/licenses/>.
-#
-# The code in this file was originally part of logilab-common, licensed under
-# the same license.
-
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
+# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
"""
Data object model, as per https://docs.python.org/3/reference/datamodel.html.
diff --git a/astroid/manager.py b/astroid/manager.py
index 846e3935..59623828 100644
--- a/astroid/manager.py
+++ b/astroid/manager.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/mixins.py b/astroid/mixins.py
index 319479de..739828d5 100644
--- a/astroid/mixins.py
+++ b/astroid/mixins.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2010-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2010-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/modutils.py b/astroid/modutils.py
index 0425da24..77081b5b 100644
--- a/astroid/modutils.py
+++ b/astroid/modutils.py
@@ -1,5 +1,10 @@
-# Copyright (c) 2014-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# -*- coding: utf-8 -*-
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
+# Copyright (c) 2015 Radosław Ganczarek <radoslaw@ganczarek.in>
+# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/node_classes.py b/astroid/node_classes.py
index 96e44ae2..42fdf7cc 100644
--- a/astroid/node_classes.py
+++ b/astroid/node_classes.py
@@ -1,5 +1,9 @@
-# Copyright (c) 2009-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2014, 2016 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2016 Jakub Wilk <jwilk@jwilk.net>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/nodes.py b/astroid/nodes.py
index 17ad4975..1c279ccf 100644
--- a/astroid/nodes.py
+++ b/astroid/nodes.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2011, 2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/objects.py b/astroid/objects.py
index cc4551af..cd3063e1 100644
--- a/astroid/objects.py
+++ b/astroid/objects.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/protocols.py b/astroid/protocols.py
index e4904de6..55e018b2 100644
--- a/astroid/protocols.py
+++ b/astroid/protocols.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2009-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2011, 2013-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/raw_building.py b/astroid/raw_building.py
index d2eefdc0..bcc26ab7 100644
--- a/astroid/raw_building.py
+++ b/astroid/raw_building.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py
index 3c2c67e4..d80033fe 100644
--- a/astroid/rebuilder.py
+++ b/astroid/rebuilder.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2009-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index e4f35fd8..747bb1bd 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -1,5 +1,9 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2011, 2013-2015 Google, Inc.
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/test_utils.py b/astroid/test_utils.py
index ef578d4b..3bdffd79 100644
--- a/astroid/test_utils.py
+++ b/astroid/test_utils.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2013-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/__init__.py b/astroid/tests/__init__.py
index 9c77de22..f8c7bff1 100644
--- a/astroid/tests/__init__.py
+++ b/astroid/tests/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/resources.py b/astroid/tests/resources.py
index 2cfa18e7..bfe196e1 100644
--- a/astroid/tests/resources.py
+++ b/astroid/tests/resources.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py
index f76f2a95..a7d27b8c 100644
--- a/astroid/tests/unittest_brain.py
+++ b/astroid/tests/unittest_brain.py
@@ -1,5 +1,10 @@
-# Copyright (c) 2013-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015 Philip Lorenz <philip@bithub.de>
+# Copyright (c) 2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2015 raylu <lurayl@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_builder.py b/astroid/tests/unittest_builder.py
index b093669a..e389bb94 100644
--- a/astroid/tests/unittest_builder.py
+++ b/astroid/tests/unittest_builder.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014-2015 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_helpers.py b/astroid/tests/unittest_helpers.py
index 91c7f423..b61b6aed 100644
--- a/astroid/tests/unittest_helpers.py
+++ b/astroid/tests/unittest_helpers.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_inference.py b/astroid/tests/unittest_inference.py
index f12969d1..4d050c12 100644
--- a/astroid/tests/unittest_inference.py
+++ b/astroid/tests/unittest_inference.py
@@ -1,5 +1,10 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2015 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015 Dmitry Pribysh <dmand@yandex.ru>
+# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_lookup.py b/astroid/tests/unittest_lookup.py
index cbe9505d..53c9b70c 100644
--- a/astroid/tests/unittest_lookup.py
+++ b/astroid/tests/unittest_lookup.py
@@ -1,5 +1,8 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2007-2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_manager.py b/astroid/tests/unittest_manager.py
index 9b0990b2..34c9ef8f 100644
--- a/astroid/tests/unittest_manager.py
+++ b/astroid/tests/unittest_manager.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006, 2009-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_modutils.py b/astroid/tests/unittest_modutils.py
index 17098025..93efa56e 100644
--- a/astroid/tests/unittest_modutils.py
+++ b/astroid/tests/unittest_modutils.py
@@ -1,5 +1,9 @@
-# Copyright (c) 2014-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# -*- coding: utf-8 -*-
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
+# Copyright (c) 2015 Radosław Ganczarek <radoslaw@ganczarek.in>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py
index addb889a..b5722491 100644
--- a/astroid/tests/unittest_nodes.py
+++ b/astroid/tests/unittest_nodes.py
@@ -1,5 +1,9 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2007, 2009-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015 Florian Bruhin <me@the-compiler.org>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_object_model.py b/astroid/tests/unittest_object_model.py
index 79462a9c..e5ba045a 100644
--- a/astroid/tests/unittest_object_model.py
+++ b/astroid/tests/unittest_object_model.py
@@ -1,25 +1,6 @@
-# Copyright (c) 2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
-# copyright 2003-2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
-# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
-#
-# This file is part of astroid.
-#
-# astroid is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by the
-# Free Software Foundation, either version 2.1 of the License, or (at your
-# option) any later version.
-#
-# astroid is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with astroid. If not, see <http://www.gnu.org/licenses/>.
-#
-# The code in this file was originally part of logilab-common, licensed under
-# the same license.
+# Copyright (c) 2016 Claudiu Popa <pcmanticore@gmail.com>
+# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
+# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
import unittest
import types
diff --git a/astroid/tests/unittest_objects.py b/astroid/tests/unittest_objects.py
index fb3ffd16..0dba8dea 100644
--- a/astroid/tests/unittest_objects.py
+++ b/astroid/tests/unittest_objects.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_peephole.py b/astroid/tests/unittest_peephole.py
index eaefc7ce..a1311fdd 100644
--- a/astroid/tests/unittest_peephole.py
+++ b/astroid/tests/unittest_peephole.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_protocols.py b/astroid/tests/unittest_protocols.py
index 17bf53d5..7e1f5c08 100644
--- a/astroid/tests/unittest_protocols.py
+++ b/astroid/tests/unittest_protocols.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_python3.py b/astroid/tests/unittest_python3.py
index 3356510b..ad8e57ba 100644
--- a/astroid/tests/unittest_python3.py
+++ b/astroid/tests/unittest_python3.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_raw_building.py b/astroid/tests/unittest_raw_building.py
index 7af90eb5..94989dba 100644
--- a/astroid/tests/unittest_raw_building.py
+++ b/astroid/tests/unittest_raw_building.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2013-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_regrtest.py b/astroid/tests/unittest_regrtest.py
index fbb752ca..3d3a00a5 100644
--- a/astroid/tests/unittest_regrtest.py
+++ b/astroid/tests/unittest_regrtest.py
@@ -1,5 +1,7 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2008, 2010-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2013-2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_scoped_nodes.py b/astroid/tests/unittest_scoped_nodes.py
index fb5f9ab2..a5b6eb55 100644
--- a/astroid/tests/unittest_scoped_nodes.py
+++ b/astroid/tests/unittest_scoped_nodes.py
@@ -1,5 +1,10 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006-2014 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2011, 2013-2015 Google, Inc.
+# Copyright (c) 2013-2016 Claudiu Popa <pcmanticore@gmail.com>
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015 Philip Lorenz <philip@bithub.de>
+# Copyright (c) 2015 Rene Zhang <rz99@cornell.edu>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_transforms.py b/astroid/tests/unittest_transforms.py
index aec7d488..8ded2b21 100644
--- a/astroid/tests/unittest_transforms.py
+++ b/astroid/tests/unittest_transforms.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/tests/unittest_utils.py b/astroid/tests/unittest_utils.py
index 4a51ad9f..a2addd2b 100644
--- a/astroid/tests/unittest_utils.py
+++ b/astroid/tests/unittest_utils.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2008-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2014, 2016 Google, Inc.
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/transforms.py b/astroid/transforms.py
index 3d91b5e7..9914ea29 100644
--- a/astroid/transforms.py
+++ b/astroid/transforms.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
diff --git a/astroid/util.py b/astroid/util.py
index 863b771e..6d2d0177 100644
--- a/astroid/util.py
+++ b/astroid/util.py
@@ -1,12 +1,9 @@
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2015-2016 Cara Vinson <ceridwenv@gmail.com>
+# Copyright (c) 2015-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER
-#
-# The code in this file was originally part of logilab-common, licensed under
-# the same license.
-
import sys
import warnings
diff --git a/setup.py b/setup.py
index 3cc8cffc..cafb9dc4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
-# Copyright (c) 2006-2016 LOGILAB S.A. (Paris, FRANCE)
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2006, 2009-2013 LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
+# Copyright (c) 2014 Google, Inc.
+# Copyright (c) 2014-2016 Claudiu Popa <pcmanticore@gmail.com>
+
# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
# For details: https://github.com/PyCQA/astroid/blob/master/COPYING.LESSER