DOC: update copyright year -> 2014

jeremygray · Jan 7, 2014 · c362cca · c362cca
1 parent 8a8b502
commit c362cca
Show file tree

Hide file tree

Showing 103 changed files with 105 additions and 105 deletions.
diff --git a/createInitFile.py b/createInitFile.py
@@ -9,7 +9,7 @@
 f.close()
 
 template="""# Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 #--------------------------------------------------------------------------

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -40,7 +40,7 @@
 
 # General information about the project.
 project = u'PsychoPy'
-copyright = u'2013, Jonathan Peirce'
+copyright = u'2014, Jonathan Peirce'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/psychopy/LICENSE.txt b/psychopy/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2013, JW Peirce.
+Copyright (c) 2002-2014, JW Peirce.
 All rights reserved.
 
 As of version 1.5 PsychoPy is licensed under the GNU General Public License (version 3). For the complete text of that license see

diff --git a/psychopy/__init__.py b/psychopy/__init__.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 #--------------------------------------------------------------------------

diff --git a/psychopy/_shadersPygame.py b/psychopy/_shadersPygame.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from OpenGL.GL import *

diff --git a/psychopy/_shadersPyglet.py b/psychopy/_shadersPyglet.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from ctypes import *

diff --git a/psychopy/app/_psychopyApp.py b/psychopy/app/_psychopyApp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import sys, psychopy
@@ -440,7 +440,7 @@ def showAbout(self, event):
         info.SetVersion('v'+psychopy.__version__)
         info.SetDescription(msg)
 
-        info.SetCopyright('(C) 2002-2013 Jonathan Peirce')
+        info.SetCopyright('(C) 2002-2014 Jonathan Peirce')
         info.SetWebSite('http://www.psychopy.org')
         info.SetLicence(license)
         info.AddDeveloper('Jonathan Peirce')

diff --git a/psychopy/app/builder/builder.py b/psychopy/app/builder/builder.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import wx

diff --git a/psychopy/app/builder/components/__init__.py b/psychopy/app/builder/components/__init__.py
@@ -1,7 +1,7 @@
 """Extensible set of components for the PsychoPy Builder view
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import os, glob, copy

diff --git a/psychopy/app/builder/components/_base.py b/psychopy/app/builder/components/_base.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import wx, copy

diff --git a/psychopy/app/builder/components/_visual.py b/psychopy/app/builder/components/_visual.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import _base

diff --git a/psychopy/app/builder/components/aperture.py b/psychopy/app/builder/components/aperture.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * # to get the template visual component

diff --git a/psychopy/app/builder/components/cedrusBox.py b/psychopy/app/builder/components/cedrusBox.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from keyboard import *

diff --git a/psychopy/app/builder/components/code.py b/psychopy/app/builder/components/code.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/dots.py b/psychopy/app/builder/components/dots.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import *

diff --git a/psychopy/app/builder/components/eyetracker.py b/psychopy/app/builder/components/eyetracker.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/grating.py b/psychopy/app/builder/components/grating.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/components/image.py b/psychopy/app/builder/components/image.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/components/ioLabs.py b/psychopy/app/builder/components/ioLabs.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/keyboard.py b/psychopy/app/builder/components/keyboard.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/microphone.py b/psychopy/app/builder/components/microphone.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 # Author: Jeremy R. Gray, 2012

diff --git a/psychopy/app/builder/components/mouse.py b/psychopy/app/builder/components/mouse.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/movie.py b/psychopy/app/builder/components/movie.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/components/parallelOut.py b/psychopy/app/builder/components/parallelOut.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/patch.py b/psychopy/app/builder/components/patch.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/components/polygon.py b/psychopy/app/builder/components/polygon.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/components/ratingscale.py b/psychopy/app/builder/components/ratingscale.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/sound.py b/psychopy/app/builder/components/sound.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _base import *

diff --git a/psychopy/app/builder/components/static.py b/psychopy/app/builder/components/static.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import _base

diff --git a/psychopy/app/builder/components/text.py b/psychopy/app/builder/components/text.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from _visual import * #to get the template visual component

diff --git a/psychopy/app/builder/experiment.py b/psychopy/app/builder/experiment.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import StringIO, sys, codecs

diff --git a/psychopy/app/coder/psychoParser.py b/psychopy/app/coder/psychoParser.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 #python text parser

diff --git a/psychopy/app/connections.py b/psychopy/app/connections.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import urllib2, re, glob

diff --git a/psychopy/app/psychopyApp.py b/psychopy/app/psychopyApp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy.app._psychopyApp import *
@@ -12,7 +12,7 @@
 
 if __name__=='__main__':
     if '-v' in sys.argv or '--version' in sys.argv:
-        print 'PsychoPy2, version %s (c)Jonathan Peirce, 2013, GNU GPL license' %psychopy.__version__
+        print 'PsychoPy2, version %s (c)Jonathan Peirce, 2014, GNU GPL license' %psychopy.__version__
         sys.exit()
     if '-h' in sys.argv or '--help' in sys.argv:
         print """Starts the PsychoPy2 application.

diff --git a/psychopy/bits.py b/psychopy/bits.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import logging

diff --git a/psychopy/calib.py b/psychopy/calib.py
@@ -1,7 +1,7 @@
 """Deprecated - use the monitors package rather than psychopy.calib
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy import logging

diff --git a/psychopy/core.py b/psychopy/core.py
@@ -1,7 +1,7 @@
 """Basic functions, including timing, rush (imported), quit
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import sys, threading

diff --git a/psychopy/data.py b/psychopy/data.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Routines for handling data structures and analysis"""
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy import gui, logging

diff --git a/psychopy/errors.py b/psychopy/errors.py
@@ -2,7 +2,7 @@
 """Errors used within Psychopy for testing and handling situations.
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 class TimeoutError(StandardError):

diff --git a/psychopy/event.py b/psychopy/event.py
@@ -3,7 +3,7 @@
 See demo_mouse.py and i{demo_joystick.py} for examples
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 # 01/2011 modified by Dave Britton to get mouse event timing

diff --git a/psychopy/filters.py b/psychopy/filters.py
@@ -3,7 +3,7 @@
 
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import numpy

diff --git a/psychopy/gamma.py b/psychopy/gamma.py
@@ -2,7 +2,7 @@
 #this currently requires a pyglet window (to identify the current scr/display)
 
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import numpy, sys, platform, ctypes, ctypes.util

diff --git a/psychopy/gui.py b/psychopy/gui.py
@@ -1,7 +1,7 @@
 """To build simple dialogues etc. (requires wxPython)
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 from psychopy import logging
 #from wxPython import wx

diff --git a/psychopy/hardware/cedrus.py b/psychopy/hardware/cedrus.py
@@ -9,7 +9,7 @@
 ----------
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy import core, logging

diff --git a/psychopy/hardware/crs/bits.py b/psychopy/hardware/crs/bits.py
@@ -3,7 +3,7 @@
 These may one day get built into psychopy.visual
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import numpy

diff --git a/psychopy/hardware/egi.py b/psychopy/hardware/egi.py
@@ -19,7 +19,7 @@
 
 """
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy import logging

diff --git a/psychopy/hardware/emulator.py b/psychopy/hardware/emulator.py
@@ -3,7 +3,7 @@
 pulses and user responses. Limitations: pyglet only; keyboard events only.
 """ 
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __author__ = 'Jeremy Gray'

diff --git a/psychopy/hardware/forp.py b/psychopy/hardware/forp.py
@@ -8,7 +8,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 # Jeremy Gray and Dan Grupe developed the asKeys and baud parameters

diff --git a/psychopy/hardware/iolab.py b/psychopy/hardware/iolab.py
@@ -1,5 +1,5 @@
 # Part of the PsychoPy library
-# Copyright (C) 2013 Jonathan Peirce
+# Copyright (C) 2014 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """This provides a basic ButtonBox class, and imports the `ioLab python library