Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Update copyright date to 2012 #1644

Closed
wants to merge 1 commit into from

5 participants

@Carreau
Owner

Well, everything in title.
I don't think it has a lot of chance to conflict with anything else.

@jdmarch jdmarch commented on the diff
IPython/config/application.py
@@ -9,7 +9,7 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2008-2011 The IPython Development Team
+# Copyright (C) 2010-2012 The IPython Development Team
@jdmarch
jdmarch added a note

why not 2008-... ?

@minrk Owner
minrk added a note

2010 is probably correct - this file didn't exist in 2008, and the copyright was probably just copied from another file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jdmarch

Otherwise, looks clean.

@minrk
Owner

Thanks, looks good enough for me.

Aside @fperez - Is there any better way that we can express this so we don't have to change the copyright dates in every file every year? That seems incredibly pointless. Something like (C) IPython Development Team, and let dates derive from git log?

@fperez
Owner

I really don't know: I've always seen copyright notices with explicit years, though we obviously let them lapse occasionally and it's no big deal. I've simply followed the tradition I've seen. But looking up online a bit just now, revealed this. Citing the relevant section here from the US Copyright Office in case that link goes down:

Visually Perceptible Copies

The notice for visually perceptible copies should contain three elements. They should appear together or in close proximity on the copies. The elements are:

    The symbol © (the letter C in a circle), or the word “Copyright,�? or the abbreviation “Copr.�?; and
    The year of first publication. If the work is a derivative work or a compilation incorporating previously published material, the year date of first publication of the derivative work or compilation is sufficient. Examples of derivative works are translations or dramatizations; an example of a compilation is an anthology. The year may be omitted when a pictorial, graphic, or sculptural work, with accompanying textual matter, if any, is reproduced in or on greeting cards, postcards, stationery, jewelry, dolls, toys, or useful articles; and
    The name of the owner of copyright in the work, or an abbreviation by which the name can be recognized, or a generally known alternative designation of the owner. Example: © 2004 Jane Doe

Based on that information, we could instead remove all ending dates from all notices, and leave only the beginning years. That would actually be nice, since it would mean never updating these things again :)

I'm +1 for changing things to removing the end years from every notice, based on this.

@jdmarch

Verging on bike-shedding, but FWIW -- first publication of what?

My lay interpretation of this, and longtime practice, has been that the copyright year in a source file is updated when and only when the source is modified. Thus 2008-2012 would mean that the file contains some code first published in 2008, some code first published in 2012, and possibly some code first published in between.

It seems unlikely that a revision constitutes a "derivative work" or "compilation".

@fperez
Owner

I suspect in a strict interpretation you're right, @jdmarch. But given that copyright exists regardless of registration, we're probably OK if we only put the year of file creation and let things be after that... In reality, the ultimate arbiter of copyright in an open source project would have to be the version control log. I'd be comfortable with leaving only the first year on the files, which has the advantage of being vastly simpler to maintain in the long run.

@minrk
Owner

I think @jdmarch is right, that the dates are all start dates - for the various parts of the file (i.e. it should not say 2012 on a file that hasn't been edited this year).

But the copyright is not actually affected in any way by what we write in the notice, so I would just keep at most the file creation year, and let people ask git about the individual snippets, which are necessarily newer than that date. Otherwise, I would leave the date out altogether, and put a single X-Y date in a top-level file.

I think individual file copyright/license is a stupid practice in general - it's like putting copyright notice on every page of a book, but it is standard.

@fperez
Owner

So if we're all OK with the idea of leaving only start dates everywhere, then we should instead close this PR (sorry @Carreau :) and have one that removes the -END parts from all files, if somebody wants to spend the time... And as we said above, for anybody who is genuinely curious, there's always git log.

@jdmarch

Legal squinting aside, start year sounds good to me.

@ivanov
Owner

i'm -1 on making sweeping changing like this across the whole codebase in one go. I'd prefer it if we slowly integrate the start-year-only proposal into individual files as we work on them for other reasons. If a file hasn't been touched for a long time, there's no reason to update its copyright now. This, to me, is similar to not having commits that just PEP8 the entire codebase in a bunch of places as one giant commit - whereas fixing PEP8-related things in a particular file of that you're changing in order to fix a bug or add a new feature is totally fine.

@minrk
Owner

@ivanov's proposal sounds sensible to me:

If you touch a file, feel free to edit the copyright to include this first year only copyright edit, if it has X-Y format.

A sweeping copyright fix is less problematic than pep8, because it doesn't touch the code with meaningless changes, but it does touch the file's history in general.

@fperez
Owner

+1 on that too. I agree that big commits that touch everything tend to create more noise than they're worth (and they often make things like rebases and cherry-picks trickier). So let's close this one and go with the above approach moving forward.

@fperez fperez closed this
@tkf tkf referenced this pull request from a commit in tkf/ipython
@tkf tkf Copyright fix on sympyprinting.py and latextools.py
See: #1644
483c5d8
@mattvonrocketstein mattvonrocketstein referenced this pull request from a commit in mattvonrocketstein/ipython
@tkf tkf Copyright fix on sympyprinting.py and latextools.py
See: #1644
5f5b5c2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 22, 2012
  1. @Carreau

    update copyright date to 2012

    Carreau authored
This page is out of date. Refresh to see the latest.
Showing with 147 additions and 76 deletions.
  1. +1 −1  COPYING.txt
  2. +1 −1  IPython/config/application.py
  3. +1 −1  IPython/config/loader.py
  4. +1 −1  IPython/core/completer.py
  5. +1 −1  IPython/core/completerlib.py
  6. +1 −1  IPython/core/display.py
  7. +1 −1  IPython/core/displayhook.py
  8. +1 −1  IPython/core/displaypub.py
  9. +1 −1  IPython/core/extensions.py
  10. +1 −1  IPython/core/formatters.py
  11. +1 −1  IPython/core/history.py
  12. +1 −1  IPython/core/interactiveshell.py
  13. +1 −1  IPython/core/magic.py
  14. +1 −1  IPython/core/profileapp.py
  15. +1 −1  IPython/core/shellapp.py
  16. +1 −1  IPython/core/tests/test_interactiveshell.py
  17. +1 −1  IPython/core/usage.py
  18. +1 −1  IPython/extensions/sympyprinting.py
  19. +1 −1  IPython/external/ssh/tunnel.py
  20. +1 −1  IPython/frontend/html/notebook/clustermanager.py
  21. +1 −1  IPython/frontend/html/notebook/handlers.py
  22. +1 −1  IPython/frontend/html/notebook/kernelmanager.py
  23. +1 −1  IPython/frontend/html/notebook/notebookapp.py
  24. +1 −1  IPython/frontend/html/notebook/notebookmanager.py
  25. +8 −0 IPython/frontend/qt/console/ansi_code_processor.py
  26. +7 −0 IPython/frontend/qt/console/bracket_matcher.py
  27. +7 −0 IPython/frontend/qt/console/call_tip_widget.py
  28. +7 −0 IPython/frontend/qt/console/completion_lexer.py
  29. +7 −0 IPython/frontend/qt/console/completion_widget.py
  30. +7 −0 IPython/frontend/qt/console/console_widget.py
  31. +7 −0 IPython/frontend/qt/console/history_console_widget.py
  32. +7 −0 IPython/frontend/qt/console/ipython_widget.py
  33. +7 −0 IPython/frontend/qt/console/kill_ring.py
  34. +7 −0 IPython/frontend/qt/console/mainwindow.py
  35. +1 −1  IPython/frontend/terminal/interactiveshell.py
  36. +1 −1  IPython/frontend/terminal/ipapp.py
  37. +1 −1  IPython/lib/__init__.py
  38. +1 −1  IPython/lib/inputhook.py
  39. +1 −1  IPython/lib/tests/test_pretty.py
  40. +1 −1  IPython/nbformat/current.py
  41. +1 −1  IPython/nbformat/v3/__init__.py
  42. +1 −1  IPython/nbformat/v3/convert.py
  43. +1 −1  IPython/nbformat/v3/nbbase.py
  44. +1 −1  IPython/nbformat/v3/nbjson.py
  45. +1 −1  IPython/nbformat/v3/nbpy.py
  46. +1 −1  IPython/nbformat/v3/rwbase.py
  47. +1 −1  IPython/parallel/apps/ipclusterapp.py
  48. +1 −1  IPython/parallel/apps/ipcontrollerapp.py
  49. +1 −1  IPython/parallel/apps/launcher.py
  50. +1 −1  IPython/parallel/client/asyncresult.py
  51. +1 −1  IPython/parallel/client/client.py
  52. +1 −1  IPython/parallel/client/remotefunction.py
  53. +1 −1  IPython/parallel/client/view.py
  54. +1 −1  IPython/parallel/controller/dictdb.py
  55. +1 −1  IPython/parallel/controller/heartmonitor.py
  56. +1 −1  IPython/parallel/controller/hub.py
  57. +1 −1  IPython/parallel/controller/scheduler.py
  58. +1 −1  IPython/parallel/controller/sqlitedb.py
  59. +1 −1  IPython/parallel/engine/streamkernel.py
  60. +1 −1  IPython/parallel/tests/__init__.py
  61. +1 −1  IPython/parallel/tests/clienttest.py
  62. +1 −1  IPython/parallel/tests/test_asyncresult.py
  63. +1 −1  IPython/parallel/tests/test_client.py
  64. +1 −1  IPython/parallel/tests/test_db.py
  65. +1 −1  IPython/parallel/tests/test_dependency.py
  66. +1 −1  IPython/parallel/tests/test_lbview.py
  67. +1 −1  IPython/parallel/tests/test_view.py
  68. +1 −1  IPython/parallel/util.py
  69. +1 −1  IPython/testing/decorators.py
  70. +1 −1  IPython/testing/iptest.py
  71. +1 −1  IPython/testing/tools.py
  72. +1 −1  IPython/utils/_process_common.py
  73. +1 −1  IPython/utils/_process_win32.py
  74. +1 −1  IPython/utils/_process_win32_controller.py
  75. +1 −1  IPython/utils/dir2.py
  76. +1 −1  IPython/utils/path.py
  77. +1 −1  IPython/utils/pickleutil.py
  78. +1 −1  IPython/utils/process.py
  79. +1 −1  IPython/utils/sysinfo.py
  80. +1 −1  IPython/utils/tests/test_path.py
  81. +1 −1  IPython/utils/tests/test_traitlets.py
  82. +1 −1  IPython/zmq/eventloops.py
  83. +1 −1  IPython/zmq/kernelapp.py
  84. +1 −1  IPython/zmq/kernelmanager.py
  85. +1 −1  IPython/zmq/session.py
  86. +1 −1  IPython/zmq/tests/test_session.py
View
2  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.
#
View
2  IPython/config/application.py
@@ -9,7 +9,7 @@
"""
#-----------------------------------------------------------------------------
-# Copyright (C) 2008-2011 The IPython Development Team
+# Copyright (C) 2010-2012 The IPython Development Team
@jdmarch
jdmarch added a note

why not 2008-... ?

@minrk Owner
minrk added a note

2010 is probably correct - this file didn't exist in 2008, and the copyright was probably just copied from another file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
View
2  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.
View
2  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. <fperez@colorado.edu>
# Copyright (C) 2001 Python Software Foundation, www.python.org
#
View
2  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.
#
View
2  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.
View
2  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 <fperez@colorado.edu>
#
# Distributed under the terms of the BSD License. The full license is in
View
2  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.
View
2  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.
View
2  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.
#
View
2  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.
#
View
2  IPython/core/interactiveshell.py
@@ -4,7 +4,7 @@
#-----------------------------------------------------------------------------
# Copyright (C) 2001 Janko Hauser <jhauser@zscout.de>
# Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu>
-# 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.
View
2  IPython/core/magic.py
@@ -5,7 +5,7 @@
#-----------------------------------------------------------------------------
# Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
# Copyright (C) 2001-2007 Fernando Perez <fperez@colorado.edu>
-# 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.
View
2  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.
View
2  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.
View
2  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.
View
2  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. <fperez@colorado.edu>
#
# Distributed under the terms of the BSD License. The full license is in
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
8 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
#-----------------------------------------------------------------------------
View
7 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
View
7 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
View
7 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
View
7 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.
View
7 IPython/frontend/qt/console/console_widget.py
@@ -1,6 +1,13 @@
""" 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
#-----------------------------------------------------------------------------
View
7 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
View
7 IPython/frontend/qt/console/ipython_widget.py
@@ -3,6 +3,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
#-----------------------------------------------------------------------------
View
7 IPython/frontend/qt/console/kill_ring.py
@@ -1,6 +1,13 @@
""" 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
#-----------------------------------------------------------------------------
View
7 IPython/frontend/qt/console/mainwindow.py
@@ -15,6 +15,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
#-----------------------------------------------------------------------------
View
2  IPython/frontend/terminal/interactiveshell.py
@@ -4,7 +4,7 @@
#-----------------------------------------------------------------------------
# Copyright (C) 2001 Janko Hauser <jhauser@zscout.de>
# Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu>
-# 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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
#
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
View
2  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.
Something went wrong with that request. Please try again.