Merge lp:~mblayman/entertainer/group-copyright into lp:entertainer

[Matt Layman]

All individual copyrights have been transferred to Entertainer Developers.

[Matt Layman (mblayman)]

This branch is boring, but important. I have received email confirmation from all of the authors agreeing to transfer their copyright to Entertainer Developers. Rather than have each one submit a branch to make the changes, I've done it for the whole tree. This branch has the following changes:

 * Copyright statements have been added to every source file.
 * All copyright holding authors have been included in docs/COPYING.
 * HACKING was modified to discuss copyright assignment.
 * I did some small cleanup of some test files that weren't using EntertainerTest for some reason.

This is a pretty big branch, but it won't require a lot of thought to review.

[Samuel Buffet (samuel-buffet)]

I have seen that everyone has agreed with the copyright change and I'm totally okay with this change.

I've read all the diff and found nothing special to say."make test" and "make lint" are okay.

So no problem with this branch.

Thanks Matt,
Samuel-

review: Approve

=== modified file 'Makefile'
--- Makefile	2009-02-10 01:40:00 +0000
+++ Makefile	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 PYTHON=`which python`
 VERBOSITY=-vv
 
 
=== modified file 'cfg/content.conf'
--- cfg/content.conf	2009-01-09 01:24:49 +0000
+++ cfg/content.conf	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 [Images]
 folders = 
 display_hidden_folders = false
 
=== modified file 'cfg/preferences.conf'
--- cfg/preferences.conf	2009-03-08 21:29:32 +0000
+++ cfg/preferences.conf	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 [Photographs]
 slideshow_step = 5
 
 
=== modified file 'cfg/themes/Black/theme.conf'
--- cfg/themes/Black/theme.conf	2008-12-14 19:58:40 +0000
+++ cfg/themes/Black/theme.conf	2009-05-09 15:56:49 +0000
@@ -1,9 +1,10 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 [Theme]
 name = Black
 comment = Black and Blue theme.
-author = Lauri Taimila
+author = Entertainer Developers
 licence = GPL
-copyright = Lauri Taimila, 2007
+copyright = Entertainer Developers, 2009
 font = Trebuchet MS
 
 [Colors]
 
=== modified file 'cfg/themes/Default/theme.conf'
--- cfg/themes/Default/theme.conf	2008-12-14 19:58:40 +0000
+++ cfg/themes/Default/theme.conf	2009-05-09 15:56:49 +0000
@@ -1,9 +1,10 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 [Theme]
 name = Default
 comment = Dark and clear theme
-author = Lauri Taimila
+author = Entertainer Developers
 licence = GPL
-copyright = Lauri Taimila, 2008
+copyright = Entertainer Developers, 2009
 font = Lucida Grande
 
 [Colors]
 
=== modified file 'docs/COPYING'
--- docs/COPYING	2009-02-01 05:26:57 +0000
+++ docs/COPYING	2009-05-09 15:45:18 +0000
@@ -345,7 +345,7 @@
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-The Entertainer authors hereby grant permission for non-GPL compatible
+The Entertainer Developers hereby grant permission for non-GPL compatible
 GStreamer plugins to be used and distributed together with GStreamer
 and Entertainer. This permission is above and beyond the permissions granted
 by the GPL license by which Entertainer is covered. If you modify this code
@@ -358,4 +358,13 @@
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
+Entertainer Developers, as referenced in each file's copyright, refers to:
+ * Jamie Bennett <[e-mail]>
+ * Joshua Scotton <[e-mail]>
+ * Lauri Taimila <[e-mail]>
+ * Matt Layman <[e-mail]>
+ * Michael Charclo <[e-mail]>
+ * Paul Hummer <[e-mail]>
+ * Samuel Buffet <[e-mail]>
+ * Teje Rodgers <[e-mail]>
 
 
=== modified file 'docs/HACKING'
--- docs/HACKING	2009-02-10 01:40:00 +0000
+++ docs/HACKING	2009-05-09 16:20:52 +0000
@@ -1,3 +1,5 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+
 Introduction
 ============
 
@@ -110,6 +112,17 @@
 available, a member of the Release Team will mark all the Fix Committed bugs
 that were in that release as Fix Released.
 
+Copyright Assignment
+====================
+
+The Entertainer project has collectively decided that copyright assignment to
+source files shall be given to the Entertainer Developers as a group. This
+greatly simplifies some problems with having individual assignment (e.g., any
+changes to the license). If contributing to Entertainer for the first time, a
+developer can add their name to the list of authors in the docs/COPYING file.
+All copyrights in source files have a standard format. Please look other source
+files for examples if adding new files.
+
 Coding Styles
 =============
 
@@ -121,7 +134,7 @@
     * Maximum line length of 80 characters, unless your code gets more
       confusing by breaking the line (be prepared to justify this).
     * No trailing whitespace at the end of a line.
-    * Make sure copyright notices are found in EVERY source file
+    * Make sure copyright notices are found in EVERY source file.
     * If code is "borrowed" from another source, please annotate that. It's
       just good practice.
     * Strings that will be displayed to the end-user must be wrapped like this
 
=== modified file 'entertainer'
--- entertainer	2008-10-25 16:41:22 +0000
+++ entertainer	2009-05-06 02:58:08 +0000
@@ -1,11 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Main frontend executable'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-__version__ = "0.2"
-
 from entertainerlib.frontend import main
 
 if __name__ == '__main__':
 
=== modified file 'entertainer-backend'
--- entertainer-backend	2008-10-25 16:41:22 +0000
+++ entertainer-backend	2009-05-06 02:58:08 +0000
@@ -1,11 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Main backend executable'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-__version__ = "0.1"
-
 import ctypes
 import os
 import sys
@@ -49,10 +45,7 @@
 
 if __name__ == "__main__":
     if len(sys.argv) > 1 and (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
-        print 'Entertainer backend %s, Copyright (c) %s' % \
-            (__version__, __copyright__)
-        print ""
-        print "Usage:"
+        print 'Entertainer backend usage:'
         print "    --help               - This help listing"
         print "    --foreground         - Run backend as foreground process"
         sys.exit(0)
 
=== modified file 'entertainer-content-manager'
--- entertainer-content-manager	2008-12-19 04:06:18 +0000
+++ entertainer-content-manager	2009-04-28 23:54:49 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Content Management executable'''
 
 import gtk
 
=== modified file 'entertainer-preferences'
--- entertainer-preferences	2008-12-19 04:06:18 +0000
+++ entertainer-preferences	2009-04-28 23:54:49 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''A preferences editing tool'''
 
 import gtk
 
=== modified file 'entertainerlib/__init__.py'
--- entertainerlib/__init__.py	2008-06-22 05:08:20 +0000
+++ entertainerlib/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer libraries'''
 
=== modified file 'entertainerlib/backend/__init__.py'
--- entertainerlib/backend/__init__.py	2008-09-19 19:30:07 +0000
+++ entertainerlib/backend/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,6 +1,3 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer Backend Libraries'''
 
-
-def main():
-    '''The backend 'main' function.'''
-    pass
 
=== modified file 'entertainerlib/backend/backend_server.py'
--- entertainerlib/backend/backend_server.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/backend/backend_server.py	2009-05-06 02:58:08 +0000
@@ -1,11 +1,6 @@
-#!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Main backend server object'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-__version__ = "0.1"
-
 import gobject
 
 from entertainerlib.utils.configuration import Configuration
 
=== modified file 'entertainerlib/backend/components/__init__.py'
--- entertainerlib/backend/components/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/backend/components/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Extra backend components'''
 
=== modified file 'entertainerlib/backend/components/feeds/__init__.py'
--- entertainerlib/backend/components/feeds/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/backend/components/feeds/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Feed component'''
 
=== modified file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
--- entertainerlib/backend/components/feeds/feed_fetcher.py	2009-02-07 21:43:35 +0000
+++ entertainerlib/backend/components/feeds/feed_fetcher.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Update all feeds to local cache'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import threading
 import feedparser
 from time import strptime
 
=== modified file 'entertainerlib/backend/components/feeds/feed_manager.py'
--- entertainerlib/backend/components/feeds/feed_manager.py	2008-08-15 23:52:30 +0000
+++ entertainerlib/backend/components/feeds/feed_manager.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''FeedManager - Manage feeds'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 from pysqlite2 import dbapi2 as sqlite
 from entertainerlib.backend.components.feeds.feed_fetcher import FeedFetcher
 
=== modified file 'entertainerlib/backend/components/mediacache/__init__.py'
--- entertainerlib/backend/components/mediacache/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/backend/components/mediacache/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Mediacache component'''
 
=== modified file 'entertainerlib/backend/components/mediacache/cache.py'
--- entertainerlib/backend/components/mediacache/cache.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/backend/components/mediacache/cache.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Interface for media caches'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class Cache:
     """
     Cache interface. Defines interface for cache handling. This
 
=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-02-19 14:30:24 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''ImageCache - Handles image file caching.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import time
 import Image
 
=== modified file 'entertainerlib/backend/components/mediacache/indexer_thread.py'
--- entertainerlib/backend/components/mediacache/indexer_thread.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/backend/components/mediacache/indexer_thread.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''IndexerThread - Walks directories recursively and adds files to cache.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import threading
 
 from entertainerlib.backend.components.mediacache.image_cache import ImageCache
 
=== modified file 'entertainerlib/backend/components/mediacache/media_cache_manager.py'
--- entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-01-06 23:51:38 +0000
+++ entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MediaCacheManager - Downloads metadata and keeps media cache up-to-date'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.utils.configuration import Configuration
 from entertainerlib.utils.logger import Logger
 
 
=== modified file 'entertainerlib/backend/components/mediacache/music_cache.py'
--- entertainerlib/backend/components/mediacache/music_cache.py	2009-05-06 06:57:07 +0000
+++ entertainerlib/backend/components/mediacache/music_cache.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MusicCache - Audio file cache.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import time
 import shutil
@@ -250,7 +247,6 @@
             - Get tags
             - Insert data to the music cache database
         """
-        # pylint: disable-msg=W0702
         try:
             mp3_file = eyeD3.Mp3AudioFile(filename, eyeD3.ID3_ANY_VERSION)
             tags = mp3_file.getTag()
 
=== modified file 'entertainerlib/backend/components/mediacache/video_cache.py'
--- entertainerlib/backend/components/mediacache/video_cache.py	2009-02-19 14:30:24 +0000
+++ entertainerlib/backend/components/mediacache/video_cache.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''VideoCache - Handles video file cache.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import time
 from pysqlite2 import dbapi2 as sqlite
 
=== modified file 'entertainerlib/backend/components/mediacache/video_metadata_search.py'
--- entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-02-07 22:12:25 +0000
+++ entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''VideoMetadataSearch - Search video file metadata from IMDB database'''
 # pylint: disable-msg=C0301
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import imdb
 import re
 
=== modified file 'entertainerlib/backend/core/__init__.py'
--- entertainerlib/backend/core/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/backend/core/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer Backend Core Libraries'''
 
=== modified file 'entertainerlib/backend/core/client_connection.py'
--- entertainerlib/backend/core/client_connection.py	2009-02-07 21:43:35 +0000
+++ entertainerlib/backend/core/client_connection.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Connects socket client to backend's message bug'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import cPickle
 from cStringIO import StringIO
 import threading
 
=== modified file 'entertainerlib/backend/core/connection_server.py'
--- entertainerlib/backend/core/connection_server.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/backend/core/connection_server.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Socket server that listens for incoming connections'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import sys
 import socket
 import threading
 
=== modified file 'entertainerlib/backend/core/db/__init__.py'
--- entertainerlib/backend/core/db/__init__.py	2008-08-02 02:56:31 +0000
+++ entertainerlib/backend/core/db/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''This module contains the storm database functionality needed for the backend
 to index and store media'''
 
 
=== modified file 'entertainerlib/backend/core/db/connection.py'
--- entertainerlib/backend/core/db/connection.py	2009-04-30 02:07:27 +0000
+++ entertainerlib/backend/core/db/connection.py	2009-05-06 01:35:19 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Contains database connection wrappers'''
 
 import os
 
=== modified file 'entertainerlib/backend/core/db/models.py'
--- entertainerlib/backend/core/db/models.py	2009-01-31 21:47:47 +0000
+++ entertainerlib/backend/core/db/models.py	2009-04-28 23:54:49 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Contains all storm ORM models'''
 # pylint: disable-msg=W0621,W0223
 
 
=== modified file 'entertainerlib/backend/core/message.py'
--- entertainerlib/backend/core/message.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/backend/core/message.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Backend component protocol for communicating'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class Message:
     """
     Backend components uses Messages to communicate with each other.
 
=== modified file 'entertainerlib/backend/core/message_bus.py'
--- entertainerlib/backend/core/message_bus.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/backend/core/message_bus.py	2009-05-06 02:58:08 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MessageBus - Heart of the backend messaging system'''
 
 import threading
@@ -7,10 +8,6 @@
 from entertainerlib.backend.core.message_type_priority import MessageType
 from entertainerlib.utils.logger import Logger
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class MessageBus:
     """
     MessageBus is the heart of the backend messaging system.
 
=== modified file 'entertainerlib/backend/core/message_bus_proxy.py'
--- entertainerlib/backend/core/message_bus_proxy.py	2009-01-05 03:25:03 +0000
+++ entertainerlib/backend/core/message_bus_proxy.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Used to connect client processes to backend MessageBus'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import socket
 import cPickle
 import threading
 
=== modified file 'entertainerlib/backend/core/message_generator.py'
--- entertainerlib/backend/core/message_generator.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/backend/core/message_generator.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Generates messages to the message bus'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
-
 import threading
 import time
 
 
=== modified file 'entertainerlib/backend/core/message_handler.py'
--- entertainerlib/backend/core/message_handler.py	2008-08-13 10:04:18 +0000
+++ entertainerlib/backend/core/message_handler.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MessageHandlers are registered to the MessageBus'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class MessageHandler(object):
     """
     MessageHandler interface determines MessageBus clients.
 
=== modified file 'entertainerlib/backend/core/message_scheduler.py'
--- entertainerlib/backend/core/message_scheduler.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/backend/core/message_scheduler.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Manage generating messages to the message bus'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import random
 
 from entertainerlib.backend.core.message_generator import MessageGenerator
 
=== modified file 'entertainerlib/backend/core/message_type_priority.py'
--- entertainerlib/backend/core/message_type_priority.py	2009-01-31 15:46:36 +0000
+++ entertainerlib/backend/core/message_type_priority.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Determines message types and priorities'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class MessagePriority:
     """
     Simply determines Message priority constants.
 
=== modified file 'entertainerlib/decorators.py'
--- entertainerlib/decorators.py	2008-12-15 20:59:31 +0000
+++ entertainerlib/decorators.py	2009-04-28 23:54:49 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Various function and method decorators.'''
 
 import warnings
 
=== modified file 'entertainerlib/exceptions.py'
--- entertainerlib/exceptions.py	2009-02-27 02:23:35 +0000
+++ entertainerlib/exceptions.py	2009-04-28 23:54:49 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Various Exceptions for Entertainer.'''
 
 
 
=== modified file 'entertainerlib/frontend/__init__.py'
--- entertainerlib/frontend/__init__.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/frontend/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Frontend gui to entertainer'''
 # pylint: disable-msg=W0612
 
 
=== modified file 'entertainerlib/frontend/backend_connection.py'
--- entertainerlib/frontend/backend_connection.py	2009-01-31 15:46:36 +0000
+++ entertainerlib/frontend/backend_connection.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Connection to the Entertainer backend'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.backend.core.message import Message
 from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
 from entertainerlib.backend.core.message_type_priority import MessageType
 
=== modified file 'entertainerlib/frontend/frontend_client.py'
--- entertainerlib/frontend/frontend_client.py	2009-02-10 00:59:03 +0000
+++ entertainerlib/frontend/frontend_client.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer Frontend - This is a client side of Entertainer.'''
 
-__licence__ = 'GPLv2'
-__copyright__ = ('2007, Lauri Taimila', '2009, Matt Layman')
-__author__ = ('Lauri Taimila <[e-mail]>',
-              'Matt Layman <[e-mail]>')
-
 import sys
 
 import gtk
 
=== modified file 'entertainerlib/frontend/gui/__init__.py'
--- entertainerlib/frontend/gui/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/frontend/gui/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
-'''Frontend gui module'''
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Frontend GUI module'''
 
=== modified file 'entertainerlib/frontend/gui/screen_history.py'
--- entertainerlib/frontend/gui/screen_history.py	2008-10-07 22:59:41 +0000
+++ entertainerlib/frontend/gui/screen_history.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Stack container for screen objects'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class ScreenHistory:
     """
     ScreenHistory contains latest screens. History is a stack container.
 
=== modified file 'entertainerlib/frontend/gui/screens/__init__.py'
--- entertainerlib/frontend/gui/screens/__init__.py	2008-08-16 04:28:47 +0000
+++ entertainerlib/frontend/gui/screens/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Various GUI screens'''
 
=== modified file 'entertainerlib/frontend/gui/screens/album.py'
--- entertainerlib/frontend/gui/screens/album.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/album.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Album - Screen allows user to browse and play tracks of the album'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 import clutter
 import pango
 
=== modified file 'entertainerlib/frontend/gui/screens/artist.py'
--- entertainerlib/frontend/gui/screens/artist.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/artist.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Artist - Screen allows user to browse music of one specific artist'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/audio_play.py	2009-05-06 03:40:22 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''AudioPlay - Screen displays information of currently playing audio'''
 # pylint: disable-msg=W0221
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 import gobject
 import clutter
 
=== modified file 'entertainerlib/frontend/gui/screens/disc.py'
--- entertainerlib/frontend/gui/screens/disc.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/disc.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Disc - Screen allows user to browse and play tracks from CD album.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 
 import cdrom
 
=== modified file 'entertainerlib/frontend/gui/screens/factory.py'
--- entertainerlib/frontend/gui/screens/factory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/frontend/gui/screens/factory.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''ScreenFactory - Create correct screen based on the type provided.'''
 
-__licence__ = 'GPLv2'
-__copyright__ = '2009, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 from entertainerlib.frontend.gui.screens.artist import Artist
 from entertainerlib.frontend.gui.screens.album import Album
 from entertainerlib.frontend.gui.screens.audio_play import AudioPlay
 
=== modified file 'entertainerlib/frontend/gui/screens/feed.py'
--- entertainerlib/frontend/gui/screens/feed.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/feed.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Feed - Screen that contains a list of entries in one feed'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/feed_entry.py'
--- entertainerlib/frontend/gui/screens/feed_entry.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/feed_entry.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''FeedEntry - Screen displays one entry of some RSS feed'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/main.py'
--- entertainerlib/frontend/gui/screens/main.py	2009-05-05 10:44:08 +0000
+++ entertainerlib/frontend/gui/screens/main.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Main - Screen has a main menu'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/movie.py'
--- entertainerlib/frontend/gui/screens/movie.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/movie.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Movie - Screen allows user to view movie information'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 import gtk
 import pango
 
=== modified file 'entertainerlib/frontend/gui/screens/music.py'
--- entertainerlib/frontend/gui/screens/music.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/music.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Music - Screen allows user to select music he/she wants to listen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
 from entertainerlib.frontend.gui.tabs.artists_tab import ArtistsTab
 
=== modified file 'entertainerlib/frontend/gui/screens/photo.py'
--- entertainerlib/frontend/gui/screens/photo.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/photo.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Photo - Screen displays photograph in fullscreen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 import gobject
 
 
=== modified file 'entertainerlib/frontend/gui/screens/photo_albums.py'
--- entertainerlib/frontend/gui/screens/photo_albums.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/photo_albums.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''PhotoAlbums - Screen contains a list of photograph albums'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 import pango
 import gobject
 
=== modified file 'entertainerlib/frontend/gui/screens/photographs.py'
--- entertainerlib/frontend/gui/screens/photographs.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/photographs.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Photographs - Screen contains a list/grid of photographs'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 import clutter
 import gobject
 
=== modified file 'entertainerlib/frontend/gui/screens/question.py'
--- entertainerlib/frontend/gui/screens/question.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/question.py	2009-05-06 01:35:19 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Question - Screen displays a question label and specified buttons.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Teje Rodgers"
-__author__ = "Teje Rodgers <[e-mail]>"
-
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.transitions.transition import Transition
 from entertainerlib.frontend.gui.widgets.label import Label
 
=== modified file 'entertainerlib/frontend/gui/screens/rss.py'
--- entertainerlib/frontend/gui/screens/rss.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/rss.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Rss - Screen displays RSS feeds'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/screen.py'
--- entertainerlib/frontend/gui/screens/screen.py	2009-04-30 01:16:33 +0000
+++ entertainerlib/frontend/gui/screens/screen.py	2009-05-06 03:40:22 +0000
@@ -1,8 +1,5 @@
-'''Screen - Screen interface. All screens has to implement this interface!'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Screen - Screen interface. All screens have to implement this interface!'''
 
 from collections import defaultdict
 
 
=== modified file 'entertainerlib/frontend/gui/screens/tv_episodes.py'
--- entertainerlib/frontend/gui/screens/tv_episodes.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/tv_episodes.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''TvEpisodes - Screen allows user to browse episodes of a season'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 import pango
 
 
=== modified file 'entertainerlib/frontend/gui/screens/tv_series.py'
--- entertainerlib/frontend/gui/screens/tv_series.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/tv_series.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''TvSeries - Screen allows user to browse seasons of one TV series'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 
 from entertainerlib.frontend.gui.screens.screen import Screen
 
=== modified file 'entertainerlib/frontend/gui/screens/video.py'
--- entertainerlib/frontend/gui/screens/video.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/video.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Video - Screen allows user to browse video library content'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.movies_tab import MoviesTab
 from entertainerlib.frontend.gui.tabs.series_tab import SeriesTab
 
=== modified file 'entertainerlib/frontend/gui/screens/video_osd.py'
--- entertainerlib/frontend/gui/screens/video_osd.py	2009-04-27 03:32:30 +0000
+++ entertainerlib/frontend/gui/screens/video_osd.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''VideoOSD - Screen is used for video playback On Screen Display'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gobject
 import clutter
 
@@ -105,10 +102,7 @@
         self.seekforward_opacity.apply(self.seekforward_texture)
 
     def _create_progress_bar(self):
-        """
-        Create the progress bar
-        @author Joshua Scotton
-        """
+        '''Create the progress bar.'''
         # Current position as time stamp
         self.current_pos = Label(0.0365, "title", 0.6, 0.9, "00:00")
         self.add(self.current_pos)
@@ -122,19 +116,13 @@
         self.display_progress_bar()
 
     def _update_progress_bar(self):
-        """
-        Update progress bar
-        @author Joshua Scotton
-        """
+        '''Update the progress bar.'''
         self.progress_bar.set_progress(self.media_player.get_media_position())
         self.current_pos.set_text(self.media_player.get_media_position_string())
         return True
 
     def display_progress_bar(self, hide_after_delay=True):
-        """
-        This displays the progress bar for three seconds
-        @author Joshua Scotton
-        """
+        '''Display the progress bar for three seconds.'''
         self.progress_bar.show()
         self.current_pos.show()
         if self.progress_bar_timeout_key is not None:
@@ -144,10 +132,7 @@
                 self.hide_progress_bar)
 
     def hide_progress_bar(self):
-        """
-        This hides the progress bar
-        @author Joshua Scotton
-        """
+        '''Hide the progress bar.'''
         self.progress_bar.hide()
         self.current_pos.hide()
 
 
=== modified file 'entertainerlib/frontend/gui/screens/weather.py'
--- entertainerlib/frontend/gui/screens/weather.py	2009-05-06 06:16:24 +0000
+++ entertainerlib/frontend/gui/screens/weather.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''WeatherScreen - Screen allows user to view current weather conditions'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Jamie Bennett"
-__author__ = "Jamie Bennett <[e-mail]>"
-
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.widgets.label import Label
 from entertainerlib.frontend.gui.widgets.texture import Texture
 
=== modified file 'entertainerlib/frontend/gui/tabs/__init__.py'
--- entertainerlib/frontend/gui/tabs/__init__.py	2008-06-08 02:53:33 +0000
+++ entertainerlib/frontend/gui/tabs/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Frontend GUI tabs module'''
 
=== modified file 'entertainerlib/frontend/gui/tabs/albums_tab.py'
--- entertainerlib/frontend/gui/tabs/albums_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/albums_tab.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Albums tab which displays albums and allows users to select them'''
 # pylint: disable-msg=W1001
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 import gobject
 import pango
 
=== modified file 'entertainerlib/frontend/gui/tabs/artists_tab.py'
--- entertainerlib/frontend/gui/tabs/artists_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/artists_tab.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Artists tab for the music screen'''
 # pylint: disable-msg=W1001
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 import gobject
 import pango
 
=== modified file 'entertainerlib/frontend/gui/tabs/lyrics_tab.py'
--- entertainerlib/frontend/gui/tabs/lyrics_tab.py	2009-04-21 21:04:56 +0000
+++ entertainerlib/frontend/gui/tabs/lyrics_tab.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Lyrics tab for the audio play screen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import pango
 import clutter
 
 
=== modified file 'entertainerlib/frontend/gui/tabs/movies_tab.py'
--- entertainerlib/frontend/gui/tabs/movies_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/movies_tab.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MoviesTab - MoviesTab is group of objects that are displayed on movie tab'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 import gtk
 import pango
 
=== modified file 'entertainerlib/frontend/gui/tabs/playing_tab.py'
--- entertainerlib/frontend/gui/tabs/playing_tab.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/frontend/gui/tabs/playing_tab.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Currently playing tab for the audio screen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import pango
 
 from entertainerlib.frontend.gui.tabs.tab import Tab
 
=== modified file 'entertainerlib/frontend/gui/tabs/series_tab.py'
--- entertainerlib/frontend/gui/tabs/series_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/series_tab.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''SeriesTab - Group of objects that are displayed on tv-series tab'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 import gtk
 import pango
 
=== modified file 'entertainerlib/frontend/gui/tabs/tab.py'
--- entertainerlib/frontend/gui/tabs/tab.py	2009-02-28 17:22:46 +0000
+++ entertainerlib/frontend/gui/tabs/tab.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tab - Tab is group of objects that are displayed on one tab'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.user_event import UserEvent
 
=== modified file 'entertainerlib/frontend/gui/tabs/tracks_tab.py'
--- entertainerlib/frontend/gui/tabs/tracks_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/tracks_tab.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tracks tab for the artist screen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 import pango
 
 
=== modified file 'entertainerlib/frontend/gui/tabs/video_clips_tab.py'
--- entertainerlib/frontend/gui/tabs/video_clips_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/video_clips_tab.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''VideoClipsTab - Group of objects that are displayed on video clips tab'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 
 import gtk
 
=== modified file 'entertainerlib/frontend/gui/transitions/__init__.py'
--- entertainerlib/frontend/gui/transitions/__init__.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/frontend/gui/transitions/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Frontend GUI transitions module'''
 
=== modified file 'entertainerlib/frontend/gui/transitions/factory.py'
--- entertainerlib/frontend/gui/transitions/factory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/frontend/gui/transitions/factory.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''TransitionFactory - create a transition object based on the configuration
 that is in the user's preferences'''
 
-__licence__ = 'GPLv2'
-__copyright__ = '2009, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 from entertainerlib.frontend.gui.transitions.fade import Fade
 from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
 from entertainerlib.frontend.gui.transitions.slide import Slide
 
=== modified file 'entertainerlib/frontend/gui/transitions/fade.py'
--- entertainerlib/frontend/gui/transitions/fade.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/frontend/gui/transitions/fade.py	2009-05-06 03:40:22 +0000
@@ -1,10 +1,8 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Fade - Transition to fade out old screen and fade in the new screen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
+
 from entertainerlib.frontend.gui.transitions.transition import Transition
 
 class Fade(Transition):
 
=== modified file 'entertainerlib/frontend/gui/transitions/no_effect.py'
--- entertainerlib/frontend/gui/transitions/no_effect.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/frontend/gui/transitions/no_effect.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''NoEffect - Simple change transition from screen 1 to screen 2'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.frontend.gui.transitions.transition import Transition
 
 class NoEffect(Transition):
 
=== modified file 'entertainerlib/frontend/gui/transitions/slide.py'
--- entertainerlib/frontend/gui/transitions/slide.py	2009-04-27 02:33:38 +0000
+++ entertainerlib/frontend/gui/transitions/slide.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Slide - Transition to slide out old screen and slide in the new screen'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.transitions.transition import Transition
 
=== modified file 'entertainerlib/frontend/gui/transitions/transition.py'
--- entertainerlib/frontend/gui/transitions/transition.py	2009-01-23 22:44:19 +0000
+++ entertainerlib/frontend/gui/transitions/transition.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Transition - All transition effects has to implement this interface!'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class Transition:
     """
     Transition interface
 
=== modified file 'entertainerlib/frontend/gui/transitions/zoom_and_fade.py'
--- entertainerlib/frontend/gui/transitions/zoom_and_fade.py	2009-01-26 23:11:40 +0000
+++ entertainerlib/frontend/gui/transitions/zoom_and_fade.py	2009-05-06 03:40:22 +0000
@@ -1,10 +1,8 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''ZoomAndFade - Transition to zoom and fade between screens'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
+
 from entertainerlib.frontend.gui.transitions.transition import Transition
 
 class ZoomAndFade(Transition):
 
=== modified file 'entertainerlib/frontend/gui/user_event.py'
--- entertainerlib/frontend/gui/user_event.py	2009-02-19 23:47:06 +0000
+++ entertainerlib/frontend/gui/user_event.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''UserEvent - Event generated by user action.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class UserEvent:
     """
     UserEvent object wraps one event.
 
=== modified file 'entertainerlib/frontend/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-05-05 10:44:08 +0000
+++ entertainerlib/frontend/gui/user_interface.py	2009-05-09 17:03:51 +0000
@@ -1,13 +1,9 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''UserInterface - Main window of the Entertainer frontend'''
 
 # Clutter uses _1 to represent the 1 key and pylint complains about it
 # pylint: disable-msg=W0212
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila, 2009, Matt Layman"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              'Matt Layman <[e-mail]>')
-
 from collections import defaultdict
 import os
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/__init__.py'
--- entertainerlib/frontend/gui/widgets/__init__.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/frontend/gui/widgets/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Fronted GUI Widgets'''
 
=== modified file 'entertainerlib/frontend/gui/widgets/arrow_texture.py'
--- entertainerlib/frontend/gui/widgets/arrow_texture.py	2008-11-13 19:56:10 +0000
+++ entertainerlib/frontend/gui/widgets/arrow_texture.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Displays text in rounded rectangle box'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 from cluttercairo import CairoTexture
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/base.py'
--- entertainerlib/frontend/gui/widgets/base.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/frontend/gui/widgets/base.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Base for widgets"""
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 from entertainerlib.utils.configuration import Configuration
 
 class Base(object):
 
=== modified file 'entertainerlib/frontend/gui/widgets/clock_label.py'
--- entertainerlib/frontend/gui/widgets/clock_label.py	2008-11-29 22:44:32 +0000
+++ entertainerlib/frontend/gui/widgets/clock_label.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''ClockLabel widget'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Matt Layman <[e-mail]>")
-
 import time
 import gobject
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/eyecandy_texture.py'
--- entertainerlib/frontend/gui/widgets/eyecandy_texture.py	2008-11-17 21:54:45 +0000
+++ entertainerlib/frontend/gui/widgets/eyecandy_texture.py	2009-05-06 03:40:22 +0000
@@ -1,10 +1,8 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Texture with rounded corners and reflection below'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
+
 from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
 from entertainerlib.frontend.gui.widgets.reflection_texture import (
     ReflectionTexture)
 
=== modified file 'entertainerlib/frontend/gui/widgets/grid_menu.py'
--- entertainerlib/frontend/gui/widgets/grid_menu.py	2009-02-08 08:44:46 +0000
+++ entertainerlib/frontend/gui/widgets/grid_menu.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''GridMenu contains a grid of textures and allows user to select one'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 class GridMenu(clutter.Group):
@@ -171,10 +168,7 @@
         self.itemgroup.remove_all()
 
     def select(self, logical_position):
-        """
-        Selects the item at the passed logical_position
-        @author Joshua Scotton
-        """
+        '''Selects the item at the passed logical_position.'''
         # pylint: disable-msg=W0612
         target = (  int(logical_position / self.row_count),
                     int(logical_position % self.row_count))
 
=== modified file 'entertainerlib/frontend/gui/widgets/image_menu.py'
--- entertainerlib/frontend/gui/widgets/image_menu.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/frontend/gui/widgets/image_menu.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Implements a grid menu that contains images'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
 
=== modified file 'entertainerlib/frontend/gui/widgets/image_menu_item.py'
--- entertainerlib/frontend/gui/widgets/image_menu_item.py	2009-01-11 00:25:55 +0000
+++ entertainerlib/frontend/gui/widgets/image_menu_item.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Menuitem that contains an image'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila, 2008, Matt Layman"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Matt Layman <[e-mail]>")
-
 from entertainerlib.frontend.gui.widgets.menu_item import MenuItem
 
 class ImageMenuItem(MenuItem):
 
=== modified file 'entertainerlib/frontend/gui/widgets/label.py'
--- entertainerlib/frontend/gui/widgets/label.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/frontend/gui/widgets/label.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Label for widget"""
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/frontend/gui/widgets/list_indicator.py'
--- entertainerlib/frontend/gui/widgets/list_indicator.py	2008-11-17 21:53:05 +0000
+++ entertainerlib/frontend/gui/widgets/list_indicator.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Displays currently selected item and length of the list'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture
 
=== modified file 'entertainerlib/frontend/gui/widgets/loading_animation.py'
--- entertainerlib/frontend/gui/widgets/loading_animation.py	2009-01-08 19:54:33 +0000
+++ entertainerlib/frontend/gui/widgets/loading_animation.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Animation widget indicates that Entertainer is loading'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import math
 import cairo
 import clutter
 
=== modified file 'entertainerlib/frontend/gui/widgets/menu.py'
--- entertainerlib/frontend/gui/widgets/menu.py	2009-02-08 08:44:46 +0000
+++ entertainerlib/frontend/gui/widgets/menu.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Menu has a list of menuitems and it allows user to select one of them'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 class Menu(clutter.Group):
 
=== modified file 'entertainerlib/frontend/gui/widgets/menu_item.py'
--- entertainerlib/frontend/gui/widgets/menu_item.py	2009-01-11 00:25:55 +0000
+++ entertainerlib/frontend/gui/widgets/menu_item.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Simple Menuitem'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/frontend/gui/widgets/menu_overlay.py'
--- entertainerlib/frontend/gui/widgets/menu_overlay.py	2008-11-17 11:20:47 +0000
+++ entertainerlib/frontend/gui/widgets/menu_overlay.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Texture that is displayed over video when menu is active'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.texture import Texture
 
=== modified file 'entertainerlib/frontend/gui/widgets/motion_buffer.py'
--- entertainerlib/frontend/gui/widgets/motion_buffer.py	2009-04-28 09:49:40 +0000
+++ entertainerlib/frontend/gui/widgets/motion_buffer.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tools for pointer motion calculations"""
 
-__licence__ = "GPLv2"
-__copyright__ = "2009, Samuel Buffet"
-__author__ = "Samuel Buffet <[e-mail]>"
-
 import math
 
 class MotionBuffer(object):
 
=== modified file 'entertainerlib/frontend/gui/widgets/progress_bar.py'
--- entertainerlib/frontend/gui/widgets/progress_bar.py	2008-11-18 07:19:27 +0000
+++ entertainerlib/frontend/gui/widgets/progress_bar.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Implements progress bar widget'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import math
 import clutter
 from cluttercairo import CairoTexture
 
=== modified file 'entertainerlib/frontend/gui/widgets/reflection_texture.py'
--- entertainerlib/frontend/gui/widgets/reflection_texture.py	2008-10-21 19:31:48 +0000
+++ entertainerlib/frontend/gui/widgets/reflection_texture.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Cairo based texture that can be used as reflection'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import gtk
 import cairo
 import clutter
 
=== modified file 'entertainerlib/frontend/gui/widgets/rounded_texture.py'
--- entertainerlib/frontend/gui/widgets/rounded_texture.py	2008-11-13 19:56:10 +0000
+++ entertainerlib/frontend/gui/widgets/rounded_texture.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Cairo based texture that rounds corners'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from cluttercairo import CairoTexture
 import gtk
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/scroll_area.py'
--- entertainerlib/frontend/gui/widgets/scroll_area.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/frontend/gui/widgets/scroll_area.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Container that has scrollbars and allows content to be scrolled'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/frontend/gui/widgets/scroll_menu.py'
--- entertainerlib/frontend/gui/widgets/scroll_menu.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/frontend/gui/widgets/scroll_menu.py	2009-05-09 17:03:51 +0000
@@ -1,11 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Menu widget that contains text items'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Samuel Buffet <[e-mail]>",
-              "Joshua Scotton <[e-mail]>")
-
 import math
 
 import clutter
 
=== modified file 'entertainerlib/frontend/gui/widgets/selector.py'
--- entertainerlib/frontend/gui/widgets/selector.py	2008-11-26 11:20:54 +0000
+++ entertainerlib/frontend/gui/widgets/selector.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Simple selector texture to show current position in menu'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.texture import Texture
 
=== modified file 'entertainerlib/frontend/gui/widgets/special_behaviours.py'
--- entertainerlib/frontend/gui/widgets/special_behaviours.py	2009-04-22 14:29:58 +0000
+++ entertainerlib/frontend/gui/widgets/special_behaviours.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Implementation of special clutter behaviours'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2009, Samuel Buffet"
-__author__ = "Samuel Buffet <[e-mail]>"
-
 import math
 
 import clutter
 
=== modified file 'entertainerlib/frontend/gui/widgets/tab_group.py'
--- entertainerlib/frontend/gui/widgets/tab_group.py	2009-02-27 00:01:53 +0000
+++ entertainerlib/frontend/gui/widgets/tab_group.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''TabGroup is a group of tabs. It draws the tab bar.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import clutter
 import pango
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/text_menu.py'
--- entertainerlib/frontend/gui/widgets/text_menu.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/frontend/gui/widgets/text_menu.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Implements basic menu that contains text labels as menuitems'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 from entertainerlib.frontend.gui.widgets.selector import Selector
 from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
 
@@ -60,7 +57,6 @@
     def get_index(self, text):
         """
         Returns index of label with the text as passed, returns -1 if not found
-        @author Joshua Scotton
         """
         for item in self.items:
             if item.label.get_text() == text:
 
=== modified file 'entertainerlib/frontend/gui/widgets/text_menu_item.py'
--- entertainerlib/frontend/gui/widgets/text_menu_item.py	2008-11-25 23:20:28 +0000
+++ entertainerlib/frontend/gui/widgets/text_menu_item.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Simple menuitem that contains a text self.label (and optionl extras)'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import pango
 import clutter
 
 
=== modified file 'entertainerlib/frontend/gui/widgets/texture.py'
--- entertainerlib/frontend/gui/widgets/texture.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/frontend/gui/widgets/texture.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Texture widget"""
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/frontend/media_player.py'
--- entertainerlib/frontend/media_player.py	2009-04-21 16:34:34 +0000
+++ entertainerlib/frontend/media_player.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MediaPlayer - MediaPlayer that plays audio and video streams'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 # import order is important here since Clutter 0.8,
 # see the pyclutter README for details
 
@@ -322,7 +319,6 @@
         """
         Returns the title of the playing media.
         @return: String
-        @author: Joshua Scotton
         """
         return self.media.get_title()
 
 
=== modified file 'entertainerlib/frontend/medialibrary/__init__.py'
--- entertainerlib/frontend/medialibrary/__init__.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/frontend/medialibrary/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,2 +1,3 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Media library handlers'''
 
 
=== modified file 'entertainerlib/frontend/medialibrary/feeds.py'
--- entertainerlib/frontend/medialibrary/feeds.py	2009-01-26 18:28:26 +0000
+++ entertainerlib/frontend/medialibrary/feeds.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''FeedLibrary - Library for RSS-feeds'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila, 2008, Joshua Scotton"
-__author__ = "Lauri Taimila <[e-mail]>, "
-__author__ += "Joshua Scotton <[e-mail]>"
-
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.utils.configuration import Configuration
 
=== modified file 'entertainerlib/frontend/medialibrary/images.py'
--- entertainerlib/frontend/medialibrary/images.py	2009-01-31 17:57:51 +0000
+++ entertainerlib/frontend/medialibrary/images.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Image Library - Interface for Entertainer image library cache'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 from pysqlite2 import dbapi2 as sqlite
 
 
=== modified file 'entertainerlib/frontend/medialibrary/music.py'
--- entertainerlib/frontend/medialibrary/music.py	2009-03-15 16:01:39 +0000
+++ entertainerlib/frontend/medialibrary/music.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Music Library - Interface for Entertainer music library cache'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import CDDB, DiscID
 from pysqlite2 import dbapi2 as sqlite
 
=== modified file 'entertainerlib/frontend/medialibrary/playable.py'
--- entertainerlib/frontend/medialibrary/playable.py	2008-12-14 20:08:09 +0000
+++ entertainerlib/frontend/medialibrary/playable.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Playable - Interface for playable streams. MediaPlayer plays Playables'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 class Playable:
     """
     Interface for playable media.
@@ -39,7 +36,6 @@
         """
         Gets the title of the stream.
         @return: String
-        @author: Joshua Scotton
         """
         return None
 
 
=== modified file 'entertainerlib/frontend/medialibrary/playlist.py'
--- entertainerlib/frontend/medialibrary/playlist.py	2008-08-02 21:33:38 +0000
+++ entertainerlib/frontend/medialibrary/playlist.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Playlist - Playlist class is a simple container for Playable objects'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import random
 
 class Playlist(object):
 
=== modified file 'entertainerlib/frontend/medialibrary/videos.py'
--- entertainerlib/frontend/medialibrary/videos.py	2009-02-01 19:15:02 +0000
+++ entertainerlib/frontend/medialibrary/videos.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Video Library - Interface for Entertainer video library cache'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007-08, Lauri Taimila, Joshua Scotton"
-__author__ = "Lauri Taimila <[e-mail]>, "
-__author__ += "Joshua Scotton <[e-mail]>"
-
 import os
 from pysqlite2 import dbapi2 as sqlite
 
 
=== modified file 'entertainerlib/frontend/translation_setup.py'
--- entertainerlib/frontend/translation_setup.py	2009-01-08 19:54:33 +0000
+++ entertainerlib/frontend/translation_setup.py	2009-05-06 02:02:20 +0000
@@ -1,11 +1,6 @@
 #!/usr/bin/env python
-"""Translation Setup Code"""
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton, 2008, Matt Layman"
-__author__ = ("Joshua Scotton <[e-mail]>",
-              "Matt Layman <[e-mail]>")
-__version__ = "0.2"
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Translation Setup Code'''
 
 import os
 
 
=== modified file 'entertainerlib/storage/__init__.py'
--- entertainerlib/storage/__init__.py	2009-02-06 06:52:14 +0000
+++ entertainerlib/storage/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Storage facilities for Entertainer (used by the client/frontend).'''
 # pylint: disable-msg=W0611
 from entertainerlib.storage.base import Storage
 
=== modified file 'entertainerlib/storage/base.py'
--- entertainerlib/storage/base.py	2009-02-06 06:34:20 +0000
+++ entertainerlib/storage/base.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Base classes for Entertainer Storages.'''
 
 
 
=== modified file 'entertainerlib/tests/__init__.py'
--- entertainerlib/tests/__init__.py	2009-02-06 07:23:29 +0000
+++ entertainerlib/tests/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''The Entertainer test suite'''
 
 import os
 
=== modified file 'entertainerlib/tests/mock.py'
--- entertainerlib/tests/mock.py	2009-04-28 11:49:43 +0000
+++ entertainerlib/tests/mock.py	2009-05-09 17:03:51 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Test mock objects'''
 # pylint: disable-msg=W0231
 
 
=== removed file 'entertainerlib/tests/test_backendserver.py'
--- entertainerlib/tests/test_backendserver.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_backendserver.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-'''Test backend server'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
-#import unittest
-#import os
-#import shutil
-
-#from entertainerlib.backend.backend_server import BackendServer
-
-#class TestBackendServer(unittest.TestCase):
-#    """This test class tests functions of the backend server"""
-#
-#    def setUp(self):
-#        self.backend = BackendServer()
-#
-#    def tearDown(self):
-#        self.backend.quitBackend()
-#
-#    def testBackendServerCreateConfiguration(self):
-#        """testBackendServerCreateConfiguration - Ensures that the
-#        configuration directory is setup properly"""
-#        # Rename the real config directory to backup
-#        self.backup_path = self.backend.config_path + "_test"
-#        if os.path.exists(self.backend.config_path):
-#            os.rename(self.backend.config_path, self.backup_path)
-#
-#        self.backend.create_configuration()
-#        self.assertTrue(os.path.exists(self.backend.config_path))
-#
-#        # Restore the existing config directory
-#        if os.path.exists(self.backend.config_path):
-#            shutil.rmtree(self.backend.config_path)
-#        os.rename(self.backup_path, self.backend.config_path)
-
 
=== modified file 'entertainerlib/tests/test_base.py'
--- entertainerlib/tests/test_base.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/tests/test_base.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests Base"""
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 from entertainerlib.frontend.gui.widgets.base import Base
 from entertainerlib.tests import EntertainerTest
 
 
=== modified file 'entertainerlib/tests/test_configuration.py'
--- entertainerlib/tests/test_configuration.py	2009-03-08 03:16:25 +0000
+++ entertainerlib/tests/test_configuration.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests Configuration'''
 # pylint: disable-msg=W0212
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import os
 
 from entertainerlib.tests import EntertainerTest
 
=== modified file 'entertainerlib/tests/test_connection.py'
--- entertainerlib/tests/test_connection.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_connection.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 "Tests ConnectionServer"
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import socket
 
 from entertainerlib.backend.core.connection_server import ConnectionServer
 
=== modified file 'entertainerlib/tests/test_database.py'
--- entertainerlib/tests/test_database.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_database.py	2009-04-28 22:36:38 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Test for backend.core.db.connection'''
 
-__license__ = 'GPLv2'
-__copyright__ = 'Paul Hummer'
-__author__ = 'Paul Hummer <[e-mail]>'
-
 import os
 
 from storm.locals import Store
 
=== modified file 'entertainerlib/tests/test_feedconfigtools.py'
--- entertainerlib/tests/test_feedconfigtools.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_feedconfigtools.py	2009-05-06 02:02:20 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Test FeedConfigTools'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 import os
 
 import gtk
 
=== modified file 'entertainerlib/tests/test_feedentryparser.py'
--- entertainerlib/tests/test_feedentryparser.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_feedentryparser.py	2009-05-06 02:02:20 +0000
@@ -1,20 +1,17 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Test feed entry parser'''
 # pylint: disable-msg=C0301
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
-import unittest
-
+from entertainerlib.tests import EntertainerTest
 from entertainerlib.utils.feed_utils import FeedEntryParser
 
 
-class FeedEntryParserTest(unittest.TestCase):
+class FeedEntryParserTest(EntertainerTest):
     '''Test the FeedEntryParser'''
 
     def setUp(self):
         """Sets up everything for the test"""
+        EntertainerTest.setUp(self)
 
         #test strings
         self.testString001 = "<body><b>Hello World</body></b>"
 
=== modified file 'entertainerlib/tests/test_frontendfeed.py'
--- entertainerlib/tests/test_frontendfeed.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_frontendfeed.py	2009-05-06 02:02:20 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests feeds from the frontend'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.frontend.medialibrary.feeds import Feed
 
=== modified file 'entertainerlib/tests/test_frontendfeedentry.py'
--- entertainerlib/tests/test_frontendfeedentry.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_frontendfeedentry.py	2009-05-06 02:02:20 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests feed entries on the frontend'''
 # pylint: disable-msg=W0212
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.frontend.medialibrary.feeds import Feed, Entry
 
=== modified file 'entertainerlib/tests/test_frontendfeedlibrary.py'
--- entertainerlib/tests/test_frontendfeedlibrary.py	2009-02-04 04:17:37 +0000
+++ entertainerlib/tests/test_frontendfeedlibrary.py	2009-05-06 02:02:20 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests feed library from the frontend'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
 
=== modified file 'entertainerlib/tests/test_imagemenuitem.py'
--- entertainerlib/tests/test_imagemenuitem.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_imagemenuitem.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests ImageMenuItem"""
 # pylint: disable-msg=W0212
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import os
 
 from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
 
=== modified file 'entertainerlib/tests/test_label.py'
--- entertainerlib/tests/test_label.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_label.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests Label"""
 # pylint: disable-msg=W0212
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/tests/test_logger.py'
--- entertainerlib/tests/test_logger.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_logger.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Logger object tests'''
 
-__license__ = 'GPLv2'
-__copyright__ = '2008, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 import logging
 
 from entertainerlib.tests import EntertainerTest
 
=== modified file 'entertainerlib/tests/test_lyricsdownloader.py'
--- entertainerlib/tests/test_lyricsdownloader.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_lyricsdownloader.py	2009-05-09 15:45:18 +0000
@@ -1,22 +1,16 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests LyricsDownloader'''
 # pylint: disable-msg=W0212
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Michael Charclo"
-__author__ = "Michael Charclo <[e-mail]>"
-
-import unittest
 import os
 import urllib
 
+from entertainerlib.tests import EntertainerTest
 from entertainerlib.utils.lyrics_downloader import LyricsDownloader
 
 THIS_DIR = os.path.dirname(__file__)
 
-class testLyricsDownloader(unittest.TestCase):
-
-    def setUp(self):
-        pass
+class testLyricsDownloader(EntertainerTest):
 
     def testLyricsConstructor(self):
         '''testMetadataConstructor - Ensures instantiation of Lyric Downloader
 
=== modified file 'entertainerlib/tests/test_messagetype.py'
--- entertainerlib/tests/test_messagetype.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_messagetype.py	2009-05-06 02:02:20 +0000
@@ -1,8 +1,5 @@
-"""MessageType test"""
-
-__license__ = 'GPLv2'
-__copyright__ = '2008, Joshua Scotton'
-__author__ = 'Joshua Scotton <[e-mail]>'
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Test MessageType'''
 
 from entertainerlib.backend.core.message_type_priority import MessageType
 from entertainerlib.tests import EntertainerTest
 
=== modified file 'entertainerlib/tests/test_models.py'
--- entertainerlib/tests/test_models.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_models.py	2009-04-28 22:36:38 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests for all models'''
 
-__license__ = 'GPLv2'
-__copyright__ = '2008, Paul Hummer'
-__author__ = 'Paul Hummer <[e-mail]>'
-
 from storm.locals import Store
 
 from entertainerlib.backend.core.db import models
 
=== modified file 'entertainerlib/tests/test_motionbuffer.py'
--- entertainerlib/tests/test_motionbuffer.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/tests/test_motionbuffer.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests MotionBuffer"""
 
-__license__ = "GPLv2"
-__copyright__ = "2009, Samuel Buffet"
-__author__ = "Samuel Buffet <[e-mail]>"
-
 from entertainerlib.frontend.gui.widgets.motion_buffer import MotionBuffer
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.tests.mock import MockPointerEvent
 
=== modified file 'entertainerlib/tests/test_music.py'
--- entertainerlib/tests/test_music.py	2009-02-14 15:26:32 +0000
+++ entertainerlib/tests/test_music.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests Music'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import os
 
 from pysqlite2 import dbapi2 as sqlite
 
=== modified file 'entertainerlib/tests/test_opmlparser.py'
--- entertainerlib/tests/test_opmlparser.py	2009-02-08 07:01:25 +0000
+++ entertainerlib/tests/test_opmlparser.py	2009-05-06 02:02:20 +0000
@@ -1,24 +1,22 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests OPMLParser'''
 # pylint: disable-msg=C0301
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
-import unittest
 import os
 import xml.parsers.expat
 
+from entertainerlib.tests import EntertainerTest
 from entertainerlib.utils.feed_utils import OPMLParser
 
 THIS_DIR = os.path.dirname(__file__)
 
 
-class OPMLParserTest(unittest.TestCase):
+class OPMLParserTest(EntertainerTest):
     '''Test OPMLParser'''
 
     def setUp(self):
         '''See unittest.TestCase'''
+        EntertainerTest.setUp(self)
 
         #set up lists and paths
         self.testURL = "http://www.scripting.com/feeds/top100.opml"
 
=== modified file 'entertainerlib/tests/test_screen.py'
--- entertainerlib/tests/test_screen.py	2009-04-27 23:12:40 +0000
+++ entertainerlib/tests/test_screen.py	2009-05-06 01:35:19 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests Screen'''
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 
 from entertainerlib.exceptions import ScreenException
 
=== modified file 'entertainerlib/tests/test_screenfactory.py'
--- entertainerlib/tests/test_screenfactory.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_screenfactory.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests ScreenFactory'''
 # pylint: disable-msg=W0212
 
-__license__ = 'GPLv2'
-__copyright__ = '2009, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 import os
 
 from entertainerlib.frontend.gui.screens.album import Album
 
=== modified file 'entertainerlib/tests/test_scrollarea.py'
--- entertainerlib/tests/test_scrollarea.py	2009-02-06 08:13:48 +0000
+++ entertainerlib/tests/test_scrollarea.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests ScrollArea"""
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import clutter
 
 from entertainerlib.frontend.gui.widgets.base import Base
 
=== modified file 'entertainerlib/tests/test_scrollmenu.py'
--- entertainerlib/tests/test_scrollmenu.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/tests/test_scrollmenu.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests ScrollMenu"""
 
-__license__ = "GPLv2"
-__copyright__ = "2009, Samuel Buffet"
-__author__ = "Samuel Buffet <[e-mail]>"
-
 import time
 
 from entertainerlib.frontend.gui.widgets.scroll_menu import ScrollMenu
 
=== modified file 'entertainerlib/tests/test_storage.py'
--- entertainerlib/tests/test_storage.py	2009-02-10 04:54:36 +0000
+++ entertainerlib/tests/test_storage.py	2009-05-06 03:40:22 +0000
@@ -1,5 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Test the Storage classes.'''
 # pylint: disable-msg=W0704,W0612
+
 from entertainerlib.storage import Storage
 from entertainerlib.tests import EntertainerTest
 
 
=== modified file 'entertainerlib/tests/test_texture.py'
--- entertainerlib/tests/test_texture.py	2009-02-06 08:33:50 +0000
+++ entertainerlib/tests/test_texture.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests Texture"""
 # pylint: disable-msg=W0212
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 import os
 
 import clutter
 
=== modified file 'entertainerlib/tests/test_theme.py'
--- entertainerlib/tests/test_theme.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_theme.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests Theme"""
 
-__license__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.utils.theme import Theme
 
 
=== modified file 'entertainerlib/tests/test_thumbnailer.py'
--- entertainerlib/tests/test_thumbnailer.py	2009-02-19 14:41:03 +0000
+++ entertainerlib/tests/test_thumbnailer.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Thumbnailer tests.'''
 # pylint: disable-msg=W0212
 
 
=== modified file 'entertainerlib/tests/test_transitionfactory.py'
--- entertainerlib/tests/test_transitionfactory.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/tests/test_transitionfactory.py	2009-04-28 22:30:06 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests TransitionFactory'''
 # pylint: disable-msg=W0212
 
-__license__ = 'GPLv2'
-__copyright__ = '2009, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 from entertainerlib.frontend.gui.transitions.factory import TransitionFactory
 from entertainerlib.frontend.gui.transitions.fade import Fade
 from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
 
=== modified file 'entertainerlib/tests/test_userinterface.py'
--- entertainerlib/tests/test_userinterface.py	2009-04-27 23:12:40 +0000
+++ entertainerlib/tests/test_userinterface.py	2009-05-06 01:35:19 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests UserInterface'''
 
-__license__ = 'GPLv2'
-__copyright__ = '2009, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 import clutter
 
 from entertainerlib.frontend.gui.screens.question import Question
 
=== modified file 'entertainerlib/tests/test_videometadatasearch.py'
--- entertainerlib/tests/test_videometadatasearch.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_videometadatasearch.py	2009-05-09 15:45:18 +0000
@@ -1,22 +1,14 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests VideoMetadataSearch'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Michael Charclo"
-__author__ = "Michael Charclo <[e-mail]>"
-
-import unittest
-
 # XXX: rockstar - Modules should not get this deep
 from entertainerlib.backend.components.mediacache.video_metadata_search import (
     VideoMetadataSearch)
+from entertainerlib.tests import EntertainerTest
 
-class testVideoMetadataSearch(unittest.TestCase):
+class testVideoMetadataSearch(EntertainerTest):
     '''Tests VideoMetdataSearch'''
 
-    def setUp(self):
-        '''See unittest.TestCase'''
-        pass
-
     def testMetadataConstructor(self):
         '''testMetadataConstructor - Ensures instantiation of metadata search
         class'''
 
=== modified file 'entertainerlib/tests/test_weather.py'
--- entertainerlib/tests/test_weather.py	2009-05-06 01:59:02 +0000
+++ entertainerlib/tests/test_weather.py	2009-05-09 17:03:51 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests Weather'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Jamie Bennett"
-__author__ = "Jamie Bennett <[e-mail]>"
-
 from datetime import datetime, timedelta, tzinfo
 
 from entertainerlib.tests import EntertainerTest
@@ -13,7 +10,6 @@
     """
     WeatherTest class
     Tests for the weather module.
-    @author: Jamie Bennett <[e-mail]>
     """
     def setUp(self):
         """Sets up everything for the test"""
 
=== modified file 'entertainerlib/thumbnailer.py'
--- entertainerlib/thumbnailer.py	2009-02-19 14:25:51 +0000
+++ entertainerlib/thumbnailer.py	2009-04-28 22:36:38 +0000
@@ -1,11 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Thumbnailer classes for image and video.'''
 # pylint: disable-msg=C0301
 
-__licence__ = "GPLv2"
-__copyright__ = "2009, Paul Hummer"
-__author__ = "Paul Hummer <[e-mail]>"
-__maintainer__ = "Paul Hummer <[e-mail]>"
-
 import os
 from threading import Event
 import hashlib
 
=== modified file 'entertainerlib/utils/__init__.py'
--- entertainerlib/utils/__init__.py	2008-08-07 01:17:29 +0000
+++ entertainerlib/utils/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer utils'''
 
=== modified file 'entertainerlib/utils/albumart_downloader.py'
--- entertainerlib/utils/albumart_downloader.py	2009-03-22 04:53:10 +0000
+++ entertainerlib/utils/albumart_downloader.py	2009-05-06 02:58:08 +0000
@@ -1,11 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''AlbumArtDownloader - Search and download album art from the internet.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila, "
-__copyright__ += "2008, Matt Layman"
-__author__ = "Lauri Taimila <[e-mail]>, "
-__author__ += "Matt Layman <[e-mail]"
-
 import os
 import re
 import locale
 
=== modified file 'entertainerlib/utils/cd_utils.py'
--- entertainerlib/utils/cd_utils.py	2008-06-16 04:10:47 +0000
+++ entertainerlib/utils/cd_utils.py	2009-05-06 02:02:20 +0000
@@ -1,10 +1,7 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Utilities for handling the cd'''
 # XXX: rockstar - Why do we have  module for a single function?
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 import os
 
 def eject_cd():
 
=== modified file 'entertainerlib/utils/configuration.py'
--- entertainerlib/utils/configuration.py	2009-03-08 21:29:32 +0000
+++ entertainerlib/utils/configuration.py	2009-05-06 02:58:08 +0000
@@ -1,10 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Configuration - Class represents Entertainer's configuration'''
 
-__licence__ = "GPLv2"
-__copyright__ = ("2007, Lauri Taimila", "2008, Matt Layman")
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Matt Layman <[e-mail]>")
-
 import os
 import sys
 import shutil
@@ -348,7 +344,6 @@
         """
         Should we display the cd eject button in frontend
         @return: Boolean
-        @author: Joshua Scotton
         """
         try:
             result = self.content_config.getboolean("CD",
 
=== modified file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py	2009-04-17 21:35:32 +0000
+++ entertainerlib/utils/content_management_dialog.py	2009-05-06 02:58:08 +0000
@@ -1,11 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Content management GUI for Entertainer'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Lauri Taimila and Joshua Scotton"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Joshua Scotton <[e-mail]>")
-
 import os
 import socket
 
 
=== modified file 'entertainerlib/utils/feed_utils.py'
--- entertainerlib/utils/feed_utils.py	2009-02-08 07:43:25 +0000
+++ entertainerlib/utils/feed_utils.py	2009-05-06 02:02:20 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Utilities for fetching feeds'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2008, Joshua Scotton"
-__author__ = "Joshua Scotton <[e-mail]>"
-
 import os
 import urllib
 from xml.dom import minidom
 
=== modified file 'entertainerlib/utils/log_viewer.py'
--- entertainerlib/utils/log_viewer.py	2009-01-11 19:20:27 +0000
+++ entertainerlib/utils/log_viewer.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Implements dialog that allows users to see logged events'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import sys
 
@@ -160,7 +157,6 @@
 def parse_row(row):
     """
     This parses the input list into a list suitable for the logviewer
-    @author Joshua Scotton
     @param row The input list [Date, Time, Class, Type + Description]
     """
     if row[3][:5] == "DEBUG":
 
=== modified file 'entertainerlib/utils/logger.py'
--- entertainerlib/utils/logger.py	2009-01-11 02:26:45 +0000
+++ entertainerlib/utils/logger.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Logger class'''
 
-__license__ = 'GPLv2'
-__copyright__ = '2008, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 import logging
 
 from entertainerlib.utils.configuration import Configuration
 
=== modified file 'entertainerlib/utils/lyrics_downloader.py'
--- entertainerlib/utils/lyrics_downloader.py	2009-03-22 04:06:48 +0000
+++ entertainerlib/utils/lyrics_downloader.py	2009-05-09 15:45:18 +0000
@@ -1,9 +1,5 @@
-"""Search and download lyrics from the internet."""
-
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = ("Lauri Taimila <[e-mail]>",
-              "Charclo Michael <[e-mail]>")
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Search and download lyrics from the internet.'''
 
 import urllib
 import socket
 
=== modified file 'entertainerlib/utils/open_feed_source_dialog.py'
--- entertainerlib/utils/open_feed_source_dialog.py	2009-02-07 17:12:21 +0000
+++ entertainerlib/utils/open_feed_source_dialog.py	2009-05-06 03:40:22 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Feed source reader'''
 
 import os
 
=== modified file 'entertainerlib/utils/preferences_dialog.py'
--- entertainerlib/utils/preferences_dialog.py	2009-03-21 20:31:35 +0000
+++ entertainerlib/utils/preferences_dialog.py	2009-05-06 03:40:22 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Preferences editing tool for Entertainer media center'''
 
 import os
 
=== modified file 'entertainerlib/utils/system_tray_icon.py'
--- entertainerlib/utils/system_tray_icon.py	2009-02-07 00:28:11 +0000
+++ entertainerlib/utils/system_tray_icon.py	2009-05-06 02:58:08 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''SystemTrayIcon class - Implements system tray icon for Entertainer.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 
 import gtk
@@ -22,10 +19,7 @@
     GLADE_DIR = os.path.join(FILE_DIR, "glade")
 
     def __init__(self, quit_callback, toggle_interface_visibility_callback):
-        """
-        Create system tray icon and pop-up menu for it.
-        @author ["Joshua Scotton", "Lauri Taimila"]
-        """
+        '''Create the system tray icon and pop-up menu for it.'''
         self.quit_callback = quit_callback
         self.toggle_interface_visibility_callback = \
             toggle_interface_visibility_callback
 
=== modified file 'entertainerlib/utils/theme.py'
--- entertainerlib/utils/theme.py	2009-02-07 21:43:35 +0000
+++ entertainerlib/utils/theme.py	2009-05-06 03:40:22 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Theme - Theme represents currently used theme.'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import sys
 import ConfigParser
 
=== modified file 'entertainerlib/utils/weather.py'
--- entertainerlib/utils/weather.py	2009-01-11 02:51:18 +0000
+++ entertainerlib/utils/weather.py	2009-04-28 22:45:31 +0000
@@ -1,11 +1,9 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """
 Weather Class
   Uses google weathers api to get a weather forecast for the next
   4 days.
 """
-__licence__ = "GPLv2"
-__copyright__ = ("2008, Jamie Bennett", "2008, Samuel Buffet")
-__author__ = ("Jamie Bennett <[e-mail]>", "Samuel Buffet")
 
 import locale
 import urllib2
@@ -35,7 +33,6 @@
 class Weather:
     """
     Weather class
-    @author: Jamie Bennett <[e-mail]>
     """
 
     def __init__(self, location=""):
 
=== modified file 'setup.py'
--- setup.py	2009-04-07 18:45:52 +0000
+++ setup.py	2009-04-28 23:54:49 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''distutils installation script'''
 
 from distutils import log
 
=== modified file 'tools/__init__.py'
--- tools/__init__.py	2008-12-18 23:23:17 +0000
+++ tools/__init__.py	2009-05-06 03:40:22 +0000
@@ -1,1 +1,2 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Entertainer tools'''
 
=== modified file 'tools/loc.py'
--- tools/loc.py	2008-12-18 23:23:17 +0000
+++ tools/loc.py	2009-04-28 23:54:49 +0000
@@ -1,3 +1,4 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Counts lines of code in entertainer'''
 import os
 
 
=== modified file 'tools/messagebus-notifier'
--- tools/messagebus-notifier	2009-02-26 22:58:43 +0000
+++ tools/messagebus-notifier	2009-05-06 02:58:08 +0000
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''A messagebus notifier tool'''
 
-__licence__ = "GPLv2"
-__copyright__ = "2007, Lauri Taimila"
-__author__ = "Lauri Taimila <[e-mail]>"
-
 import os
 import sys
 
 
=== modified file 'tools/translations_generator.py'
--- tools/translations_generator.py	2009-02-07 17:12:21 +0000
+++ tools/translations_generator.py	2009-04-28 22:30:06 +0000
@@ -1,9 +1,6 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Generate translations related files, pot/po/mo'''
 
-__license__ = 'GPLv2'
-__copyright__ = '2008, Matt Layman'
-__author__ = 'Matt Layman <[e-mail]>'
-
 import glob
 import os
 import re