diff --git a/COPYING.txt b/COPYING.txt index 64205fe4853..bc947336550 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -77,7 +77,7 @@ With this in mind, the following banner should be used in any source code file to indicate the copyright and license terms: #----------------------------------------------------------------------------- -# Copyright (c) 2010, IPython Development Team. +# Copyright (c) 2012, IPython Development Team. # # Distributed under the terms of the Modified BSD License. # diff --git a/IPython/config/application.py b/IPython/config/application.py index ba26b571ede..cbab19481b3 100644 --- a/IPython/config/application.py +++ b/IPython/config/application.py @@ -9,7 +9,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/config/loader.py b/IPython/config/loader.py index cfbd92b46e2..4dd29ca3dee 100644 --- a/IPython/config/loader.py +++ b/IPython/config/loader.py @@ -8,7 +8,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 8ebf1263bf6..53e0c15eba9 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -53,7 +53,7 @@ # proper procedure is to maintain its copyright as belonging to the Python # Software Foundation (in addition to my own, for all new code). # -# Copyright (C) 2008-2011 IPython Development Team +# Copyright (C) 2008-2012 IPython Development Team # Copyright (C) 2001-2007 Fernando Perez. # Copyright (C) 2001 Python Software Foundation, www.python.org # diff --git a/IPython/core/completerlib.py b/IPython/core/completerlib.py index f739ca0d6c6..a7850cb8dd9 100644 --- a/IPython/core/completerlib.py +++ b/IPython/core/completerlib.py @@ -3,7 +3,7 @@ These are all loaded by default by IPython. """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team. +# Copyright (C) 2010-2012 The IPython Development Team. # # Distributed under the terms of the BSD License. # diff --git a/IPython/core/display.py b/IPython/core/display.py index 9035abdd115..ba90897181b 100644 --- a/IPython/core/display.py +++ b/IPython/core/display.py @@ -7,7 +7,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py index 5eebb5f2842..4699c44dc75 100644 --- a/IPython/core/displayhook.py +++ b/IPython/core/displayhook.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # Copyright (C) 2001-2007 Fernando Perez # # Distributed under the terms of the BSD License. The full license is in diff --git a/IPython/core/displaypub.py b/IPython/core/displaypub.py index 388757ea3cf..168c5c73493 100644 --- a/IPython/core/displaypub.py +++ b/IPython/core/displaypub.py @@ -17,7 +17,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/extensions.py b/IPython/core/extensions.py index f7602dd8527..2ea1be25cc9 100644 --- a/IPython/core/extensions.py +++ b/IPython/core/extensions.py @@ -7,7 +7,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/formatters.py b/IPython/core/formatters.py index f964501cdb1..3b343a0a688 100644 --- a/IPython/core/formatters.py +++ b/IPython/core/formatters.py @@ -8,7 +8,7 @@ * Brian Granger """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011, IPython Development Team. +# Copyright (C) 2010-2012, IPython Development Team. # # Distributed under the terms of the Modified BSD License. # diff --git a/IPython/core/history.py b/IPython/core/history.py index df981e9fcb5..b984594d10c 100644 --- a/IPython/core/history.py +++ b/IPython/core/history.py @@ -1,6 +1,6 @@ """ History related magics and functionality """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team. +# Copyright (C) 2010-2012 The IPython Development Team. # # Distributed under the terms of the BSD License. # diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index 14beee88798..45992738f4d 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -4,7 +4,7 @@ #----------------------------------------------------------------------------- # Copyright (C) 2001 Janko Hauser # Copyright (C) 2001-2007 Fernando Perez. -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/magic.py b/IPython/core/magic.py index 70d700a6b94..6c25fbd4c13 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -5,7 +5,7 @@ #----------------------------------------------------------------------------- # Copyright (C) 2001 Janko Hauser and # Copyright (C) 2001-2007 Fernando Perez -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/profileapp.py b/IPython/core/profileapp.py index b09b0aa8837..4cda10ba6ed 100644 --- a/IPython/core/profileapp.py +++ b/IPython/core/profileapp.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py index 9398518515f..4c835cc8eff 100644 --- a/IPython/core/shellapp.py +++ b/IPython/core/shellapp.py @@ -10,7 +10,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py index 5b65e9f43a5..eae914b82c2 100644 --- a/IPython/core/tests/test_interactiveshell.py +++ b/IPython/core/tests/test_interactiveshell.py @@ -10,7 +10,7 @@ * Fernando Perez """ #----------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/core/usage.py b/IPython/core/usage.py index 303106f52df..006404d692d 100644 --- a/IPython/core/usage.py +++ b/IPython/core/usage.py @@ -2,7 +2,7 @@ """Usage information for the main IPython applications. """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # Copyright (C) 2001-2007 Fernando Perez. # # Distributed under the terms of the BSD License. The full license is in diff --git a/IPython/extensions/sympyprinting.py b/IPython/extensions/sympyprinting.py index be0cfb90a41..5785f863933 100644 --- a/IPython/extensions/sympyprinting.py +++ b/IPython/extensions/sympyprinting.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/external/ssh/tunnel.py b/IPython/external/ssh/tunnel.py index 4fce68c008b..e92b72d2902 100644 --- a/IPython/external/ssh/tunnel.py +++ b/IPython/external/ssh/tunnel.py @@ -7,7 +7,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/html/notebook/clustermanager.py b/IPython/frontend/html/notebook/clustermanager.py index 27e1e9bb8e0..c5aa4514aad 100644 --- a/IPython/frontend/html/notebook/clustermanager.py +++ b/IPython/frontend/html/notebook/clustermanager.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py index 62b3b82755b..5033dd0b565 100644 --- a/IPython/frontend/html/notebook/handlers.py +++ b/IPython/frontend/html/notebook/handlers.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/html/notebook/kernelmanager.py b/IPython/frontend/html/notebook/kernelmanager.py index 7029e839025..3e031f76cf6 100644 --- a/IPython/frontend/html/notebook/kernelmanager.py +++ b/IPython/frontend/html/notebook/kernelmanager.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 8f4f10a38c1..c627f06ed60 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -6,7 +6,7 @@ * Brian Granger """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/html/notebook/notebookmanager.py b/IPython/frontend/html/notebook/notebookmanager.py index 9acf0cd8a5f..fffab970b3c 100644 --- a/IPython/frontend/html/notebook/notebookmanager.py +++ b/IPython/frontend/html/notebook/notebookmanager.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/qt/console/ansi_code_processor.py b/IPython/frontend/qt/console/ansi_code_processor.py index cdcb2062485..6f88ac0a7bc 100644 --- a/IPython/frontend/qt/console/ansi_code_processor.py +++ b/IPython/frontend/qt/console/ansi_code_processor.py @@ -1,5 +1,13 @@ """ Utilities for processing ANSI escape codes and special ASCII characters. """ + +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- diff --git a/IPython/frontend/qt/console/bracket_matcher.py b/IPython/frontend/qt/console/bracket_matcher.py index f7955b93e63..9f12b7eed11 100644 --- a/IPython/frontend/qt/console/bracket_matcher.py +++ b/IPython/frontend/qt/console/bracket_matcher.py @@ -1,6 +1,13 @@ """ Provides bracket matching for Q[Plain]TextEdit widgets. """ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + # System library imports from IPython.external.qt import QtCore, QtGui diff --git a/IPython/frontend/qt/console/call_tip_widget.py b/IPython/frontend/qt/console/call_tip_widget.py index c91873754f3..d748957320d 100644 --- a/IPython/frontend/qt/console/call_tip_widget.py +++ b/IPython/frontend/qt/console/call_tip_widget.py @@ -3,6 +3,13 @@ from textwrap import dedent from unicodedata import category +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + # System library imports from IPython.external.qt import QtCore, QtGui diff --git a/IPython/frontend/qt/console/completion_lexer.py b/IPython/frontend/qt/console/completion_lexer.py index 1d65bf90bd0..1465c89c3af 100644 --- a/IPython/frontend/qt/console/completion_lexer.py +++ b/IPython/frontend/qt/console/completion_lexer.py @@ -1,6 +1,13 @@ # System library imports from pygments.token import Token, is_token_subtype +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + class CompletionLexer(object): """ Uses Pygments and some auxillary information to lex code snippets for diff --git a/IPython/frontend/qt/console/completion_widget.py b/IPython/frontend/qt/console/completion_widget.py index 194b8439416..a8df1b13696 100644 --- a/IPython/frontend/qt/console/completion_widget.py +++ b/IPython/frontend/qt/console/completion_widget.py @@ -1,6 +1,13 @@ # System library imports from IPython.external.qt import QtCore, QtGui +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + class CompletionWidget(QtGui.QListWidget): """ A widget for GUI tab completion. diff --git a/IPython/frontend/qt/console/console_widget.py b/IPython/frontend/qt/console/console_widget.py index 646ae14d963..1e49c2ee09b 100644 --- a/IPython/frontend/qt/console/console_widget.py +++ b/IPython/frontend/qt/console/console_widget.py @@ -1,5 +1,12 @@ """ An abstract base class for console-type widgets. """ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- diff --git a/IPython/frontend/qt/console/history_console_widget.py b/IPython/frontend/qt/console/history_console_widget.py index b175a17c52f..f8241829892 100644 --- a/IPython/frontend/qt/console/history_console_widget.py +++ b/IPython/frontend/qt/console/history_console_widget.py @@ -1,3 +1,10 @@ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + # System library imports from IPython.external.qt import QtGui diff --git a/IPython/frontend/qt/console/ipython_widget.py b/IPython/frontend/qt/console/ipython_widget.py index 04490d60785..533aa94e271 100644 --- a/IPython/frontend/qt/console/ipython_widget.py +++ b/IPython/frontend/qt/console/ipython_widget.py @@ -2,6 +2,13 @@ supports the additional functionality provided by the IPython kernel. """ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- diff --git a/IPython/frontend/qt/console/kill_ring.py b/IPython/frontend/qt/console/kill_ring.py index 98d1d09d830..321d45cd822 100644 --- a/IPython/frontend/qt/console/kill_ring.py +++ b/IPython/frontend/qt/console/kill_ring.py @@ -1,5 +1,12 @@ """ A generic Emacs-style kill ring, as well as a Qt-specific version. """ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- diff --git a/IPython/frontend/qt/console/mainwindow.py b/IPython/frontend/qt/console/mainwindow.py index 8ee7e6497df..5873a7d67e2 100644 --- a/IPython/frontend/qt/console/mainwindow.py +++ b/IPython/frontend/qt/console/mainwindow.py @@ -14,6 +14,13 @@ """ +#----------------------------------------------------------------------------- +# Copyright (C) 2010-2012 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- # Imports #----------------------------------------------------------------------------- diff --git a/IPython/frontend/terminal/interactiveshell.py b/IPython/frontend/terminal/interactiveshell.py index 1c3e13af3f9..52860f54cc2 100644 --- a/IPython/frontend/terminal/interactiveshell.py +++ b/IPython/frontend/terminal/interactiveshell.py @@ -4,7 +4,7 @@ #----------------------------------------------------------------------------- # Copyright (C) 2001 Janko Hauser # Copyright (C) 2001-2007 Fernando Perez. -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py index 8b687720bb7..980c523cc2a 100755 --- a/IPython/frontend/terminal/ipapp.py +++ b/IPython/frontend/terminal/ipapp.py @@ -13,7 +13,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/lib/__init__.py b/IPython/lib/__init__.py index 482dceab7f8..2ccc9402db3 100644 --- a/IPython/lib/__init__.py +++ b/IPython/lib/__init__.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py index a90f1d65947..8ade6463afa 100644 --- a/IPython/lib/inputhook.py +++ b/IPython/lib/inputhook.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py index 9b65bbfdcc2..a4e594501cb 100644 --- a/IPython/lib/tests/test_pretty.py +++ b/IPython/lib/tests/test_pretty.py @@ -1,7 +1,7 @@ """Tests for IPython.lib.pretty. """ #----------------------------------------------------------------------------- -# Copyright (c) 2011, the IPython Development Team. +# Copyright (C) 2011-2012, the IPython Development Team. # # Distributed under the terms of the Modified BSD License. # diff --git a/IPython/nbformat/current.py b/IPython/nbformat/current.py index c16efc42683..0777e0ca1d2 100644 --- a/IPython/nbformat/current.py +++ b/IPython/nbformat/current.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/__init__.py b/IPython/nbformat/v3/__init__.py index c8fa25d3e80..38de0236afe 100644 --- a/IPython/nbformat/v3/__init__.py +++ b/IPython/nbformat/v3/__init__.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/convert.py b/IPython/nbformat/v3/convert.py index 8914fef8218..3d72a1a4052 100644 --- a/IPython/nbformat/v3/convert.py +++ b/IPython/nbformat/v3/convert.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/nbbase.py b/IPython/nbformat/v3/nbbase.py index 2bc2fd48fba..faf6b65b282 100644 --- a/IPython/nbformat/v3/nbbase.py +++ b/IPython/nbformat/v3/nbbase.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/nbjson.py b/IPython/nbformat/v3/nbjson.py index 5c63a4ede00..be005f90c6d 100644 --- a/IPython/nbformat/v3/nbjson.py +++ b/IPython/nbformat/v3/nbjson.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/nbpy.py b/IPython/nbformat/v3/nbpy.py index 1130ceec793..42881da0782 100644 --- a/IPython/nbformat/v3/nbpy.py +++ b/IPython/nbformat/v3/nbpy.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/nbformat/v3/rwbase.py b/IPython/nbformat/v3/rwbase.py index 63861082094..a3c5a3f8a6b 100644 --- a/IPython/nbformat/v3/rwbase.py +++ b/IPython/nbformat/v3/rwbase.py @@ -6,7 +6,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py index 0e88bbc3ff4..41743a91b51 100755 --- a/IPython/parallel/apps/ipclusterapp.py +++ b/IPython/parallel/apps/ipclusterapp.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/apps/ipcontrollerapp.py b/IPython/parallel/apps/ipcontrollerapp.py index ead40a71bc5..517f0882924 100755 --- a/IPython/parallel/apps/ipcontrollerapp.py +++ b/IPython/parallel/apps/ipcontrollerapp.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/apps/launcher.py b/IPython/parallel/apps/launcher.py index 87a84a04e00..401a359c9a7 100644 --- a/IPython/parallel/apps/launcher.py +++ b/IPython/parallel/apps/launcher.py @@ -9,7 +9,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/client/asyncresult.py b/IPython/parallel/client/asyncresult.py index a55bd2f6c16..950e7e4b80c 100644 --- a/IPython/parallel/client/asyncresult.py +++ b/IPython/parallel/client/asyncresult.py @@ -5,7 +5,7 @@ * MinRK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/client/client.py b/IPython/parallel/client/client.py index ef122fbcc87..79562fa4fa8 100644 --- a/IPython/parallel/client/client.py +++ b/IPython/parallel/client/client.py @@ -5,7 +5,7 @@ * MinRK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/client/remotefunction.py b/IPython/parallel/client/remotefunction.py index ea47005ea50..81c08796ed3 100644 --- a/IPython/parallel/client/remotefunction.py +++ b/IPython/parallel/client/remotefunction.py @@ -6,7 +6,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/client/view.py b/IPython/parallel/client/view.py index bf0dabee42c..75f99154055 100644 --- a/IPython/parallel/client/view.py +++ b/IPython/parallel/client/view.py @@ -5,7 +5,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/controller/dictdb.py b/IPython/parallel/controller/dictdb.py index 0b4a3c753c3..f431e38358c 100644 --- a/IPython/parallel/controller/dictdb.py +++ b/IPython/parallel/controller/dictdb.py @@ -40,7 +40,7 @@ $lt,$gt,$lte,$gte,$ne,$in,$nin,$all,$mod,$exists """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/controller/heartmonitor.py b/IPython/parallel/controller/heartmonitor.py index 83d967d0e79..4f322bd6e8d 100755 --- a/IPython/parallel/controller/heartmonitor.py +++ b/IPython/parallel/controller/heartmonitor.py @@ -8,7 +8,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/controller/hub.py b/IPython/parallel/controller/hub.py index c6e51a809e3..8c8ffed1e94 100644 --- a/IPython/parallel/controller/hub.py +++ b/IPython/parallel/controller/hub.py @@ -7,7 +7,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/controller/scheduler.py b/IPython/parallel/controller/scheduler.py index 25c4a2c77bb..11e3fce2f76 100644 --- a/IPython/parallel/controller/scheduler.py +++ b/IPython/parallel/controller/scheduler.py @@ -9,7 +9,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/controller/sqlitedb.py b/IPython/parallel/controller/sqlitedb.py index 0a85517e993..e5d45714d3e 100644 --- a/IPython/parallel/controller/sqlitedb.py +++ b/IPython/parallel/controller/sqlitedb.py @@ -5,7 +5,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/engine/streamkernel.py b/IPython/parallel/engine/streamkernel.py index 91fe845ebba..323c2c7dfef 100644 --- a/IPython/parallel/engine/streamkernel.py +++ b/IPython/parallel/engine/streamkernel.py @@ -9,7 +9,7 @@ * Evan Patterson """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/__init__.py b/IPython/parallel/tests/__init__.py index 70d88c61923..05a7c30e70a 100644 --- a/IPython/parallel/tests/__init__.py +++ b/IPython/parallel/tests/__init__.py @@ -1,7 +1,7 @@ """toplevel setup/teardown for parallel tests.""" #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/clienttest.py b/IPython/parallel/tests/clienttest.py index b90229305d5..14e0175dcd4 100644 --- a/IPython/parallel/tests/clienttest.py +++ b/IPython/parallel/tests/clienttest.py @@ -6,7 +6,7 @@ """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_asyncresult.py b/IPython/parallel/tests/test_asyncresult.py index dfc3d368fe9..85a5d7bb7d3 100644 --- a/IPython/parallel/tests/test_asyncresult.py +++ b/IPython/parallel/tests/test_asyncresult.py @@ -6,7 +6,7 @@ """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_client.py b/IPython/parallel/tests/test_client.py index 48ba9e97bd4..bc14821e123 100644 --- a/IPython/parallel/tests/test_client.py +++ b/IPython/parallel/tests/test_client.py @@ -6,7 +6,7 @@ """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_db.py b/IPython/parallel/tests/test_db.py index cf0d65a3ca7..7a4580970a3 100644 --- a/IPython/parallel/tests/test_db.py +++ b/IPython/parallel/tests/test_db.py @@ -6,7 +6,7 @@ """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_dependency.py b/IPython/parallel/tests/test_dependency.py index 1fb1e50549f..f9399cfccd2 100644 --- a/IPython/parallel/tests/test_dependency.py +++ b/IPython/parallel/tests/test_dependency.py @@ -8,7 +8,7 @@ __docformat__ = "restructuredtext en" #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_lbview.py b/IPython/parallel/tests/test_lbview.py index f1774ac1547..05c41d80f59 100644 --- a/IPython/parallel/tests/test_lbview.py +++ b/IPython/parallel/tests/test_lbview.py @@ -6,7 +6,7 @@ * Min RK """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/tests/test_view.py b/IPython/parallel/tests/test_view.py index 7c94b851b14..0018d9a4ea3 100644 --- a/IPython/parallel/tests/test_view.py +++ b/IPython/parallel/tests/test_view.py @@ -6,7 +6,7 @@ * Min RK """ #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/parallel/util.py b/IPython/parallel/util.py index f96704af384..60fc25365f6 100644 --- a/IPython/parallel/util.py +++ b/IPython/parallel/util.py @@ -5,7 +5,7 @@ * Min RK """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py index d03b068a9fd..f04fcbd213b 100644 --- a/IPython/testing/decorators.py +++ b/IPython/testing/decorators.py @@ -37,7 +37,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2009-2011 The IPython Development Team +# Copyright (C) 2009-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 8b42500755e..e8095f3081d 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -15,7 +15,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2009-2011 The IPython Development Team +# Copyright (C) 2009-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py index a8038b3fe80..8359ed054f8 100644 --- a/IPython/testing/tools.py +++ b/IPython/testing/tools.py @@ -13,7 +13,7 @@ from __future__ import absolute_import #----------------------------------------------------------------------------- -# Copyright (C) 2009-2011 The IPython Development Team +# Copyright (C) 2009-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/_process_common.py b/IPython/utils/_process_common.py index d01fb35c171..949bb02260a 100644 --- a/IPython/utils/_process_common.py +++ b/IPython/utils/_process_common.py @@ -5,7 +5,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py index 7ee9b62f258..36bf1d0ffd4 100644 --- a/IPython/utils/_process_win32.py +++ b/IPython/utils/_process_win32.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/_process_win32_controller.py b/IPython/utils/_process_win32_controller.py index f4e7c15be8c..a9d90ecbfdf 100644 --- a/IPython/utils/_process_win32_controller.py +++ b/IPython/utils/_process_win32_controller.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/dir2.py b/IPython/utils/dir2.py index 818baadabe4..1026058f0ed 100644 --- a/IPython/utils/dir2.py +++ b/IPython/utils/dir2.py @@ -3,7 +3,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/path.py b/IPython/utils/path.py index 36f7f140953..5672080ad23 100644 --- a/IPython/utils/path.py +++ b/IPython/utils/path.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/pickleutil.py b/IPython/utils/pickleutil.py index 695d880142b..8add2a0b6b1 100644 --- a/IPython/utils/pickleutil.py +++ b/IPython/utils/pickleutil.py @@ -5,7 +5,7 @@ __docformat__ = "restructuredtext en" #------------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/process.py b/IPython/utils/process.py index 637914ad360..918423662aa 100644 --- a/IPython/utils/process.py +++ b/IPython/utils/process.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py index 0cabd7458b7..e1ca73ec1f5 100644 --- a/IPython/utils/sysinfo.py +++ b/IPython/utils/sysinfo.py @@ -4,7 +4,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py index fa3c182d9d3..e7031d61ada 100644 --- a/IPython/utils/tests/test_path.py +++ b/IPython/utils/tests/test_path.py @@ -2,7 +2,7 @@ """Tests for IPython.utils.path.py""" #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/utils/tests/test_traitlets.py b/IPython/utils/tests/test_traitlets.py index f893372cce9..f1fb46bef97 100644 --- a/IPython/utils/tests/test_traitlets.py +++ b/IPython/utils/tests/test_traitlets.py @@ -11,7 +11,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/zmq/eventloops.py b/IPython/zmq/eventloops.py index 3b8b89535ec..b7dc68b8187 100644 --- a/IPython/zmq/eventloops.py +++ b/IPython/zmq/eventloops.py @@ -3,7 +3,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/zmq/kernelapp.py b/IPython/zmq/kernelapp.py index bc112f3cdcc..811bff748cc 100644 --- a/IPython/zmq/kernelapp.py +++ b/IPython/zmq/kernelapp.py @@ -5,7 +5,7 @@ * MinRK """ #----------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING.txt, distributed as part of this software. diff --git a/IPython/zmq/kernelmanager.py b/IPython/zmq/kernelmanager.py index f531a40a3d6..980374565b1 100644 --- a/IPython/zmq/kernelmanager.py +++ b/IPython/zmq/kernelmanager.py @@ -5,7 +5,7 @@ """ #----------------------------------------------------------------------------- -# Copyright (C) 2008-2011 The IPython Development Team +# Copyright (C) 2008-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/zmq/session.py b/IPython/zmq/session.py index e92254d2502..7b2fe81a6e7 100644 --- a/IPython/zmq/session.py +++ b/IPython/zmq/session.py @@ -14,7 +14,7 @@ * Fernando Perez """ #----------------------------------------------------------------------------- -# Copyright (C) 2010-2011 The IPython Development Team +# Copyright (C) 2010-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software. diff --git a/IPython/zmq/tests/test_session.py b/IPython/zmq/tests/test_session.py index 33c6bf57141..d99064cacf3 100644 --- a/IPython/zmq/tests/test_session.py +++ b/IPython/zmq/tests/test_session.py @@ -1,7 +1,7 @@ """test building messages with streamsession""" #------------------------------------------------------------------------------- -# Copyright (C) 2011 The IPython Development Team +# Copyright (C) 2011-2012 The IPython Development Team # # Distributed under the terms of the BSD License. The full license is in # the file COPYING, distributed as part of this software.