Entertainer Media Center

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

  1. group-copyright
  2. Merge into trunk
Proposed by Matt Layman
Status: Merged
Approved by: Matt Layman
Approved revision: 378
Merged at revision: not available
Proposed branch: lp:~mblayman/entertainer/group-copyright
Merge into: lp:entertainer
Diff against target: None lines
To merge this branch: bzr merge lp:~mblayman/entertainer/group-copyright
Reviewer Review Type Date Requested Status
Samuel Buffet (community) Approve
Review via email: mp+6376@code.launchpad.net

Commit message

All individual copyrights have been transferred to Entertainer Developers.

To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

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.

Revision history for this message
Samuel Buffet (samuel-buffet) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-02-10 01:40:00 +0000
3+++ Makefile 2009-05-06 03:40:22 +0000
4@@ -1,3 +1,4 @@
5+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
6 PYTHON=`which python`
7 VERBOSITY=-vv
8
9
10=== modified file 'cfg/content.conf'
11--- cfg/content.conf 2009-01-09 01:24:49 +0000
12+++ cfg/content.conf 2009-05-06 03:40:22 +0000
13@@ -1,3 +1,4 @@
14+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
15 [Images]
16 folders =
17 display_hidden_folders = false
18
19=== modified file 'cfg/preferences.conf'
20--- cfg/preferences.conf 2009-03-08 21:29:32 +0000
21+++ cfg/preferences.conf 2009-05-06 03:40:22 +0000
22@@ -1,3 +1,4 @@
23+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
24 [Photographs]
25 slideshow_step = 5
26
27
28=== modified file 'cfg/themes/Black/theme.conf'
29--- cfg/themes/Black/theme.conf 2008-12-14 19:58:40 +0000
30+++ cfg/themes/Black/theme.conf 2009-05-09 15:56:49 +0000
31@@ -1,9 +1,10 @@
32+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
33 [Theme]
34 name = Black
35 comment = Black and Blue theme.
36-author = Lauri Taimila
37+author = Entertainer Developers
38 licence = GPL
39-copyright = Lauri Taimila, 2007
40+copyright = Entertainer Developers, 2009
41 font = Trebuchet MS
42
43 [Colors]
44
45=== modified file 'cfg/themes/Default/theme.conf'
46--- cfg/themes/Default/theme.conf 2008-12-14 19:58:40 +0000
47+++ cfg/themes/Default/theme.conf 2009-05-09 15:56:49 +0000
48@@ -1,9 +1,10 @@
49+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
50 [Theme]
51 name = Default
52 comment = Dark and clear theme
53-author = Lauri Taimila
54+author = Entertainer Developers
55 licence = GPL
56-copyright = Lauri Taimila, 2008
57+copyright = Entertainer Developers, 2009
58 font = Lucida Grande
59
60 [Colors]
61
62=== modified file 'docs/COPYING'
63--- docs/COPYING 2009-02-01 05:26:57 +0000
64+++ docs/COPYING 2009-05-09 15:45:18 +0000
65@@ -345,7 +345,7 @@
66 the Free Software Foundation; either version 2 of the License, or
67 (at your option) any later version.
68
69-The Entertainer authors hereby grant permission for non-GPL compatible
70+The Entertainer Developers hereby grant permission for non-GPL compatible
71 GStreamer plugins to be used and distributed together with GStreamer
72 and Entertainer. This permission is above and beyond the permissions granted
73 by the GPL license by which Entertainer is covered. If you modify this code
74@@ -358,4 +358,13 @@
75 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
76 GNU General Public License for more details.
77
78+Entertainer Developers, as referenced in each file's copyright, refers to:
79+ * Jamie Bennett <jamie@linuxuk.org>
80+ * Joshua Scotton <josh@joshuascotton.com>
81+ * Lauri Taimila <lauri@taimila.com>
82+ * Matt Layman <laymansterms.dev@gmail.com>
83+ * Michael Charclo <charclo.michael@gmail.com>
84+ * Paul Hummer <paul.hummer@canonical.com>
85+ * Samuel Buffet <samuel.buffet@gmail.com>
86+ * Teje Rodgers <contact@tejerodgers.com>
87
88
89=== modified file 'docs/HACKING'
90--- docs/HACKING 2009-02-10 01:40:00 +0000
91+++ docs/HACKING 2009-05-09 16:20:52 +0000
92@@ -1,3 +1,5 @@
93+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
94+
95 Introduction
96 ============
97
98@@ -110,6 +112,17 @@
99 available, a member of the Release Team will mark all the Fix Committed bugs
100 that were in that release as Fix Released.
101
102+Copyright Assignment
103+====================
104+
105+The Entertainer project has collectively decided that copyright assignment to
106+source files shall be given to the Entertainer Developers as a group. This
107+greatly simplifies some problems with having individual assignment (e.g., any
108+changes to the license). If contributing to Entertainer for the first time, a
109+developer can add their name to the list of authors in the docs/COPYING file.
110+All copyrights in source files have a standard format. Please look other source
111+files for examples if adding new files.
112+
113 Coding Styles
114 =============
115
116@@ -121,7 +134,7 @@
117 * Maximum line length of 80 characters, unless your code gets more
118 confusing by breaking the line (be prepared to justify this).
119 * No trailing whitespace at the end of a line.
120- * Make sure copyright notices are found in EVERY source file
121+ * Make sure copyright notices are found in EVERY source file.
122 * If code is "borrowed" from another source, please annotate that. It's
123 just good practice.
124 * Strings that will be displayed to the end-user must be wrapped like this
125
126=== modified file 'entertainer'
127--- entertainer 2008-10-25 16:41:22 +0000
128+++ entertainer 2009-05-06 02:58:08 +0000
129@@ -1,11 +1,7 @@
130 #!/usr/bin/env python
131+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
132 '''Main frontend executable'''
133
134-__licence__ = "GPLv2"
135-__copyright__ = "2007, Lauri Taimila"
136-__author__ = "Lauri Taimila <lauri@taimila.com>"
137-__version__ = "0.2"
138-
139 from entertainerlib.frontend import main
140
141 if __name__ == '__main__':
142
143=== modified file 'entertainer-backend'
144--- entertainer-backend 2008-10-25 16:41:22 +0000
145+++ entertainer-backend 2009-05-06 02:58:08 +0000
146@@ -1,11 +1,7 @@
147 #!/usr/bin/env python
148+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
149 '''Main backend executable'''
150
151-__licence__ = "GPLv2"
152-__copyright__ = "2007, Lauri Taimila"
153-__author__ = "Lauri Taimila <lauri@taimila.com>"
154-__version__ = "0.1"
155-
156 import ctypes
157 import os
158 import sys
159@@ -49,10 +45,7 @@
160
161 if __name__ == "__main__":
162 if len(sys.argv) > 1 and (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
163- print 'Entertainer backend %s, Copyright (c) %s' % \
164- (__version__, __copyright__)
165- print ""
166- print "Usage:"
167+ print 'Entertainer backend usage:'
168 print " --help - This help listing"
169 print " --foreground - Run backend as foreground process"
170 sys.exit(0)
171
172=== modified file 'entertainer-content-manager'
173--- entertainer-content-manager 2008-12-19 04:06:18 +0000
174+++ entertainer-content-manager 2009-04-28 23:54:49 +0000
175@@ -1,4 +1,5 @@
176 #!/usr/bin/env python
177+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
178 '''Content Management executable'''
179
180 import gtk
181
182=== modified file 'entertainer-preferences'
183--- entertainer-preferences 2008-12-19 04:06:18 +0000
184+++ entertainer-preferences 2009-04-28 23:54:49 +0000
185@@ -1,4 +1,5 @@
186 #!/usr/bin/env python
187+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
188 '''A preferences editing tool'''
189
190 import gtk
191
192=== modified file 'entertainerlib/__init__.py'
193--- entertainerlib/__init__.py 2008-06-22 05:08:20 +0000
194+++ entertainerlib/__init__.py 2009-05-06 03:40:22 +0000
195@@ -1,1 +1,2 @@
196+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
197 '''Entertainer libraries'''
198
199=== modified file 'entertainerlib/backend/__init__.py'
200--- entertainerlib/backend/__init__.py 2008-09-19 19:30:07 +0000
201+++ entertainerlib/backend/__init__.py 2009-05-06 03:40:22 +0000
202@@ -1,6 +1,3 @@
203+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
204 '''Entertainer Backend Libraries'''
205
206-
207-def main():
208- '''The backend 'main' function.'''
209- pass
210
211=== modified file 'entertainerlib/backend/backend_server.py'
212--- entertainerlib/backend/backend_server.py 2009-02-08 07:01:25 +0000
213+++ entertainerlib/backend/backend_server.py 2009-05-06 02:58:08 +0000
214@@ -1,11 +1,6 @@
215-#!/usr/bin/env python
216+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
217 '''Main backend server object'''
218
219-__licence__ = "GPLv2"
220-__copyright__ = "2007, Lauri Taimila"
221-__author__ = "Lauri Taimila <lauri@taimila.com>"
222-__version__ = "0.1"
223-
224 import gobject
225
226 from entertainerlib.utils.configuration import Configuration
227
228=== modified file 'entertainerlib/backend/components/__init__.py'
229--- entertainerlib/backend/components/__init__.py 2008-08-16 04:28:47 +0000
230+++ entertainerlib/backend/components/__init__.py 2009-05-06 03:40:22 +0000
231@@ -1,1 +1,2 @@
232+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
233 '''Extra backend components'''
234
235=== modified file 'entertainerlib/backend/components/feeds/__init__.py'
236--- entertainerlib/backend/components/feeds/__init__.py 2008-08-16 04:28:47 +0000
237+++ entertainerlib/backend/components/feeds/__init__.py 2009-05-06 03:40:22 +0000
238@@ -1,1 +1,2 @@
239+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
240 '''Feed component'''
241
242=== modified file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
243--- entertainerlib/backend/components/feeds/feed_fetcher.py 2009-02-07 21:43:35 +0000
244+++ entertainerlib/backend/components/feeds/feed_fetcher.py 2009-05-06 02:58:08 +0000
245@@ -1,9 +1,6 @@
246+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
247 '''Update all feeds to local cache'''
248
249-__licence__ = "GPLv2"
250-__copyright__ = "2007, Lauri Taimila"
251-__author__ = "Lauri Taimila <lauri@taimila.com>"
252-
253 import threading
254 import feedparser
255 from time import strptime
256
257=== modified file 'entertainerlib/backend/components/feeds/feed_manager.py'
258--- entertainerlib/backend/components/feeds/feed_manager.py 2008-08-15 23:52:30 +0000
259+++ entertainerlib/backend/components/feeds/feed_manager.py 2009-05-06 02:58:08 +0000
260@@ -1,9 +1,6 @@
261+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
262 '''FeedManager - Manage feeds'''
263
264-__licence__ = "GPLv2"
265-__copyright__ = "2007, Lauri Taimila"
266-__author__ = "Lauri Taimila <lauri@taimila.com>"
267-
268 import os
269 from pysqlite2 import dbapi2 as sqlite
270 from entertainerlib.backend.components.feeds.feed_fetcher import FeedFetcher
271
272=== modified file 'entertainerlib/backend/components/mediacache/__init__.py'
273--- entertainerlib/backend/components/mediacache/__init__.py 2008-08-16 04:28:47 +0000
274+++ entertainerlib/backend/components/mediacache/__init__.py 2009-05-06 03:40:22 +0000
275@@ -1,1 +1,2 @@
276+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
277 '''Mediacache component'''
278
279=== modified file 'entertainerlib/backend/components/mediacache/cache.py'
280--- entertainerlib/backend/components/mediacache/cache.py 2008-08-02 21:33:38 +0000
281+++ entertainerlib/backend/components/mediacache/cache.py 2009-05-06 02:58:08 +0000
282@@ -1,9 +1,6 @@
283+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
284 '''Interface for media caches'''
285
286-__licence__ = "GPLv2"
287-__copyright__ = "2007, Lauri Taimila"
288-__author__ = "Lauri Taimila <lauri@taimila.com>"
289-
290 class Cache:
291 """
292 Cache interface. Defines interface for cache handling. This
293
294=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
295--- entertainerlib/backend/components/mediacache/image_cache.py 2009-02-19 14:30:24 +0000
296+++ entertainerlib/backend/components/mediacache/image_cache.py 2009-05-06 02:58:08 +0000
297@@ -1,9 +1,6 @@
298+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
299 '''ImageCache - Handles image file caching.'''
300
301-__licence__ = "GPLv2"
302-__copyright__ = "2007, Lauri Taimila"
303-__author__ = "Lauri Taimila <lauri@taimila.com>"
304-
305 import os
306 import time
307 import Image
308
309=== modified file 'entertainerlib/backend/components/mediacache/indexer_thread.py'
310--- entertainerlib/backend/components/mediacache/indexer_thread.py 2008-08-02 21:33:38 +0000
311+++ entertainerlib/backend/components/mediacache/indexer_thread.py 2009-05-06 02:58:08 +0000
312@@ -1,9 +1,6 @@
313+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
314 '''IndexerThread - Walks directories recursively and adds files to cache.'''
315
316-__licence__ = "GPLv2"
317-__copyright__ = "2007, Lauri Taimila"
318-__author__ = "Lauri Taimila <lauri@taimila.com>"
319-
320 import threading
321
322 from entertainerlib.backend.components.mediacache.image_cache import ImageCache
323
324=== modified file 'entertainerlib/backend/components/mediacache/media_cache_manager.py'
325--- entertainerlib/backend/components/mediacache/media_cache_manager.py 2009-01-06 23:51:38 +0000
326+++ entertainerlib/backend/components/mediacache/media_cache_manager.py 2009-05-06 02:58:08 +0000
327@@ -1,9 +1,6 @@
328+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
329 '''MediaCacheManager - Downloads metadata and keeps media cache up-to-date'''
330
331-__licence__ = "GPLv2"
332-__copyright__ = "2007, Lauri Taimila"
333-__author__ = "Lauri Taimila <lauri@taimila.com>"
334-
335 from entertainerlib.utils.configuration import Configuration
336 from entertainerlib.utils.logger import Logger
337
338
339=== modified file 'entertainerlib/backend/components/mediacache/music_cache.py'
340--- entertainerlib/backend/components/mediacache/music_cache.py 2009-05-06 06:57:07 +0000
341+++ entertainerlib/backend/components/mediacache/music_cache.py 2009-05-09 17:03:51 +0000
342@@ -1,9 +1,6 @@
343+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
344 '''MusicCache - Audio file cache.'''
345
346-__licence__ = "GPLv2"
347-__copyright__ = "2007, Lauri Taimila"
348-__author__ = "Lauri Taimila <lauri@taimila.com>"
349-
350 import os
351 import time
352 import shutil
353@@ -250,7 +247,6 @@
354 - Get tags
355 - Insert data to the music cache database
356 """
357- # pylint: disable-msg=W0702
358 try:
359 mp3_file = eyeD3.Mp3AudioFile(filename, eyeD3.ID3_ANY_VERSION)
360 tags = mp3_file.getTag()
361
362=== modified file 'entertainerlib/backend/components/mediacache/video_cache.py'
363--- entertainerlib/backend/components/mediacache/video_cache.py 2009-02-19 14:30:24 +0000
364+++ entertainerlib/backend/components/mediacache/video_cache.py 2009-05-06 02:58:08 +0000
365@@ -1,9 +1,6 @@
366+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
367 '''VideoCache - Handles video file cache.'''
368
369-__licence__ = "GPLv2"
370-__copyright__ = "2007, Lauri Taimila"
371-__author__ = "Lauri Taimila <lauri@taimila.com>"
372-
373 import os
374 import time
375 from pysqlite2 import dbapi2 as sqlite
376
377=== modified file 'entertainerlib/backend/components/mediacache/video_metadata_search.py'
378--- entertainerlib/backend/components/mediacache/video_metadata_search.py 2009-02-07 22:12:25 +0000
379+++ entertainerlib/backend/components/mediacache/video_metadata_search.py 2009-05-06 02:58:08 +0000
380@@ -1,10 +1,7 @@
381+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
382 '''VideoMetadataSearch - Search video file metadata from IMDB database'''
383 # pylint: disable-msg=C0301
384
385-__licence__ = "GPLv2"
386-__copyright__ = "2008, Lauri Taimila"
387-__author__ = "Lauri Taimila <lauri@taimila.com>"
388-
389 import os
390 import imdb
391 import re
392
393=== modified file 'entertainerlib/backend/core/__init__.py'
394--- entertainerlib/backend/core/__init__.py 2008-08-16 04:28:47 +0000
395+++ entertainerlib/backend/core/__init__.py 2009-05-06 03:40:22 +0000
396@@ -1,1 +1,2 @@
397+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
398 '''Entertainer Backend Core Libraries'''
399
400=== modified file 'entertainerlib/backend/core/client_connection.py'
401--- entertainerlib/backend/core/client_connection.py 2009-02-07 21:43:35 +0000
402+++ entertainerlib/backend/core/client_connection.py 2009-05-06 02:58:08 +0000
403@@ -1,9 +1,6 @@
404+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
405 '''Connects socket client to backend's message bug'''
406
407-__licence__ = "GPLv2"
408-__copyright__ = "2007, Lauri Taimila"
409-__author__ = "Lauri Taimila <lauri@taimila.com>"
410-
411 import cPickle
412 from cStringIO import StringIO
413 import threading
414
415=== modified file 'entertainerlib/backend/core/connection_server.py'
416--- entertainerlib/backend/core/connection_server.py 2009-02-06 08:13:48 +0000
417+++ entertainerlib/backend/core/connection_server.py 2009-05-06 02:58:08 +0000
418@@ -1,9 +1,6 @@
419+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
420 '''Socket server that listens for incoming connections'''
421
422-__licence__ = "GPLv2"
423-__copyright__ = "2007, Lauri Taimila"
424-__author__ = "Lauri Taimila <lauri@taimila.com>"
425-
426 import sys
427 import socket
428 import threading
429
430=== modified file 'entertainerlib/backend/core/db/__init__.py'
431--- entertainerlib/backend/core/db/__init__.py 2008-08-02 02:56:31 +0000
432+++ entertainerlib/backend/core/db/__init__.py 2009-05-06 03:40:22 +0000
433@@ -1,3 +1,4 @@
434+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
435 '''This module contains the storm database functionality needed for the backend
436 to index and store media'''
437
438
439=== modified file 'entertainerlib/backend/core/db/connection.py'
440--- entertainerlib/backend/core/db/connection.py 2009-04-30 02:07:27 +0000
441+++ entertainerlib/backend/core/db/connection.py 2009-05-06 01:35:19 +0000
442@@ -1,3 +1,4 @@
443+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
444 '''Contains database connection wrappers'''
445
446 import os
447
448=== modified file 'entertainerlib/backend/core/db/models.py'
449--- entertainerlib/backend/core/db/models.py 2009-01-31 21:47:47 +0000
450+++ entertainerlib/backend/core/db/models.py 2009-04-28 23:54:49 +0000
451@@ -1,3 +1,4 @@
452+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
453 '''Contains all storm ORM models'''
454 # pylint: disable-msg=W0621,W0223
455
456
457=== modified file 'entertainerlib/backend/core/message.py'
458--- entertainerlib/backend/core/message.py 2008-08-02 21:33:38 +0000
459+++ entertainerlib/backend/core/message.py 2009-05-06 02:58:08 +0000
460@@ -1,9 +1,6 @@
461+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
462 '''Backend component protocol for communicating'''
463
464-__licence__ = "GPLv2"
465-__copyright__ = "2007, Lauri Taimila"
466-__author__ = "Lauri Taimila <lauri@taimila.com>"
467-
468 class Message:
469 """
470 Backend components uses Messages to communicate with each other.
471
472=== modified file 'entertainerlib/backend/core/message_bus.py'
473--- entertainerlib/backend/core/message_bus.py 2009-02-06 08:13:48 +0000
474+++ entertainerlib/backend/core/message_bus.py 2009-05-06 02:58:08 +0000
475@@ -1,3 +1,4 @@
476+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
477 '''MessageBus - Heart of the backend messaging system'''
478
479 import threading
480@@ -7,10 +8,6 @@
481 from entertainerlib.backend.core.message_type_priority import MessageType
482 from entertainerlib.utils.logger import Logger
483
484-__licence__ = "GPLv2"
485-__copyright__ = "2007, Lauri Taimila"
486-__author__ = "Lauri Taimila <lauri@taimila.com>"
487-
488 class MessageBus:
489 """
490 MessageBus is the heart of the backend messaging system.
491
492=== modified file 'entertainerlib/backend/core/message_bus_proxy.py'
493--- entertainerlib/backend/core/message_bus_proxy.py 2009-01-05 03:25:03 +0000
494+++ entertainerlib/backend/core/message_bus_proxy.py 2009-05-06 02:58:08 +0000
495@@ -1,9 +1,6 @@
496+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
497 '''Used to connect client processes to backend MessageBus'''
498
499-__licence__ = "GPLv2"
500-__copyright__ = "2007, Lauri Taimila"
501-__author__ = "Lauri Taimila <lauri@taimila.com>"
502-
503 import socket
504 import cPickle
505 import threading
506
507=== modified file 'entertainerlib/backend/core/message_generator.py'
508--- entertainerlib/backend/core/message_generator.py 2008-08-02 21:33:38 +0000
509+++ entertainerlib/backend/core/message_generator.py 2009-05-06 02:58:08 +0000
510@@ -1,10 +1,6 @@
511+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
512 '''Generates messages to the message bus'''
513
514-__licence__ = "GPLv2"
515-__copyright__ = "2007, Lauri Taimila"
516-__author__ = "Lauri Taimila <lauri@taimila.com>"
517-
518-
519 import threading
520 import time
521
522
523=== modified file 'entertainerlib/backend/core/message_handler.py'
524--- entertainerlib/backend/core/message_handler.py 2008-08-13 10:04:18 +0000
525+++ entertainerlib/backend/core/message_handler.py 2009-05-06 02:58:08 +0000
526@@ -1,9 +1,6 @@
527+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
528 '''MessageHandlers are registered to the MessageBus'''
529
530-__licence__ = "GPLv2"
531-__copyright__ = "2007, Lauri Taimila"
532-__author__ = "Lauri Taimila <lauri@taimila.com>"
533-
534 class MessageHandler(object):
535 """
536 MessageHandler interface determines MessageBus clients.
537
538=== modified file 'entertainerlib/backend/core/message_scheduler.py'
539--- entertainerlib/backend/core/message_scheduler.py 2008-08-02 21:33:38 +0000
540+++ entertainerlib/backend/core/message_scheduler.py 2009-05-06 02:58:08 +0000
541@@ -1,9 +1,6 @@
542+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
543 '''Manage generating messages to the message bus'''
544
545-__licence__ = "GPLv2"
546-__copyright__ = "2007, Lauri Taimila"
547-__author__ = "Lauri Taimila <lauri@taimila.com>"
548-
549 import random
550
551 from entertainerlib.backend.core.message_generator import MessageGenerator
552
553=== modified file 'entertainerlib/backend/core/message_type_priority.py'
554--- entertainerlib/backend/core/message_type_priority.py 2009-01-31 15:46:36 +0000
555+++ entertainerlib/backend/core/message_type_priority.py 2009-05-06 02:58:08 +0000
556@@ -1,9 +1,6 @@
557+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
558 '''Determines message types and priorities'''
559
560-__licence__ = "GPLv2"
561-__copyright__ = "2007, Lauri Taimila"
562-__author__ = "Lauri Taimila <lauri@taimila.com>"
563-
564 class MessagePriority:
565 """
566 Simply determines Message priority constants.
567
568=== modified file 'entertainerlib/decorators.py'
569--- entertainerlib/decorators.py 2008-12-15 20:59:31 +0000
570+++ entertainerlib/decorators.py 2009-04-28 23:54:49 +0000
571@@ -1,3 +1,4 @@
572+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
573 '''Various function and method decorators.'''
574
575 import warnings
576
577=== modified file 'entertainerlib/exceptions.py'
578--- entertainerlib/exceptions.py 2009-02-27 02:23:35 +0000
579+++ entertainerlib/exceptions.py 2009-04-28 23:54:49 +0000
580@@ -1,3 +1,4 @@
581+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
582 '''Various Exceptions for Entertainer.'''
583
584
585
586=== modified file 'entertainerlib/frontend/__init__.py'
587--- entertainerlib/frontend/__init__.py 2009-03-08 03:16:25 +0000
588+++ entertainerlib/frontend/__init__.py 2009-05-06 03:40:22 +0000
589@@ -1,3 +1,4 @@
590+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
591 '''Frontend gui to entertainer'''
592 # pylint: disable-msg=W0612
593
594
595=== modified file 'entertainerlib/frontend/backend_connection.py'
596--- entertainerlib/frontend/backend_connection.py 2009-01-31 15:46:36 +0000
597+++ entertainerlib/frontend/backend_connection.py 2009-05-06 02:58:08 +0000
598@@ -1,9 +1,6 @@
599+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
600 '''Connection to the Entertainer backend'''
601
602-__licence__ = "GPLv2"
603-__copyright__ = "2007, Lauri Taimila"
604-__author__ = "Lauri Taimila <lauri@taimila.com>"
605-
606 from entertainerlib.backend.core.message import Message
607 from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
608 from entertainerlib.backend.core.message_type_priority import MessageType
609
610=== modified file 'entertainerlib/frontend/frontend_client.py'
611--- entertainerlib/frontend/frontend_client.py 2009-02-10 00:59:03 +0000
612+++ entertainerlib/frontend/frontend_client.py 2009-05-06 02:58:08 +0000
613@@ -1,10 +1,6 @@
614+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
615 '''Entertainer Frontend - This is a client side of Entertainer.'''
616
617-__licence__ = 'GPLv2'
618-__copyright__ = ('2007, Lauri Taimila', '2009, Matt Layman')
619-__author__ = ('Lauri Taimila <lauri@taimila.com>',
620- 'Matt Layman <laymansterms.dev@gmail.com>')
621-
622 import sys
623
624 import gtk
625
626=== modified file 'entertainerlib/frontend/gui/__init__.py'
627--- entertainerlib/frontend/gui/__init__.py 2008-08-16 04:28:47 +0000
628+++ entertainerlib/frontend/gui/__init__.py 2009-05-06 03:40:22 +0000
629@@ -1,1 +1,2 @@
630-'''Frontend gui module'''
631+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
632+'''Frontend GUI module'''
633
634=== modified file 'entertainerlib/frontend/gui/screen_history.py'
635--- entertainerlib/frontend/gui/screen_history.py 2008-10-07 22:59:41 +0000
636+++ entertainerlib/frontend/gui/screen_history.py 2009-05-06 03:40:22 +0000
637@@ -1,9 +1,6 @@
638+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
639 '''Stack container for screen objects'''
640
641-__licence__ = "GPLv2"
642-__copyright__ = "2007, Lauri Taimila"
643-__author__ = "Lauri Taimila <lauri@taimila.com>"
644-
645 class ScreenHistory:
646 """
647 ScreenHistory contains latest screens. History is a stack container.
648
649=== modified file 'entertainerlib/frontend/gui/screens/__init__.py'
650--- entertainerlib/frontend/gui/screens/__init__.py 2008-08-16 04:28:47 +0000
651+++ entertainerlib/frontend/gui/screens/__init__.py 2009-05-06 03:40:22 +0000
652@@ -1,1 +1,2 @@
653+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
654 '''Various GUI screens'''
655
656=== modified file 'entertainerlib/frontend/gui/screens/album.py'
657--- entertainerlib/frontend/gui/screens/album.py 2009-04-27 03:32:30 +0000
658+++ entertainerlib/frontend/gui/screens/album.py 2009-05-06 03:40:22 +0000
659@@ -1,9 +1,6 @@
660+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
661 '''Album - Screen allows user to browse and play tracks of the album'''
662
663-__licence__ = "GPLv2"
664-__copyright__ = "2007, Lauri Taimila"
665-__author__ = "Lauri Taimila <lauri@taimila.com>"
666-
667 import gtk
668 import clutter
669 import pango
670
671=== modified file 'entertainerlib/frontend/gui/screens/artist.py'
672--- entertainerlib/frontend/gui/screens/artist.py 2009-04-27 03:32:30 +0000
673+++ entertainerlib/frontend/gui/screens/artist.py 2009-05-06 03:40:22 +0000
674@@ -1,9 +1,6 @@
675+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
676 '''Artist - Screen allows user to browse music of one specific artist'''
677
678-__licence__ = "GPLv2"
679-__copyright__ = "2007, Lauri Taimila"
680-__author__ = "Lauri Taimila <lauri@taimila.com>"
681-
682 import pango
683
684 from entertainerlib.frontend.gui.screens.screen import Screen
685
686=== modified file 'entertainerlib/frontend/gui/screens/audio_play.py'
687--- entertainerlib/frontend/gui/screens/audio_play.py 2009-04-27 03:32:30 +0000
688+++ entertainerlib/frontend/gui/screens/audio_play.py 2009-05-06 03:40:22 +0000
689@@ -1,10 +1,7 @@
690+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
691 '''AudioPlay - Screen displays information of currently playing audio'''
692 # pylint: disable-msg=W0221
693
694-__licence__ = "GPLv2"
695-__copyright__ = "2007, Lauri Taimila"
696-__author__ = "Lauri Taimila <lauri@taimila.com>"
697-
698 import gtk
699 import gobject
700 import clutter
701
702=== modified file 'entertainerlib/frontend/gui/screens/disc.py'
703--- entertainerlib/frontend/gui/screens/disc.py 2009-04-27 03:32:30 +0000
704+++ entertainerlib/frontend/gui/screens/disc.py 2009-05-06 03:40:22 +0000
705@@ -1,9 +1,6 @@
706+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
707 '''Disc - Screen allows user to browse and play tracks from CD album.'''
708
709-__licence__ = "GPLv2"
710-__copyright__ = "2007, Lauri Taimila"
711-__author__ = "Lauri Taimila <lauri@taimila.com>"
712-
713 import os
714
715 import cdrom
716
717=== modified file 'entertainerlib/frontend/gui/screens/factory.py'
718--- entertainerlib/frontend/gui/screens/factory.py 2009-02-07 17:12:21 +0000
719+++ entertainerlib/frontend/gui/screens/factory.py 2009-04-28 22:30:06 +0000
720@@ -1,9 +1,6 @@
721+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
722 '''ScreenFactory - Create correct screen based on the type provided.'''
723
724-__licence__ = 'GPLv2'
725-__copyright__ = '2009, Matt Layman'
726-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
727-
728 from entertainerlib.frontend.gui.screens.artist import Artist
729 from entertainerlib.frontend.gui.screens.album import Album
730 from entertainerlib.frontend.gui.screens.audio_play import AudioPlay
731
732=== modified file 'entertainerlib/frontend/gui/screens/feed.py'
733--- entertainerlib/frontend/gui/screens/feed.py 2009-04-27 03:32:30 +0000
734+++ entertainerlib/frontend/gui/screens/feed.py 2009-05-06 03:40:22 +0000
735@@ -1,9 +1,6 @@
736+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
737 '''Feed - Screen that contains a list of entries in one feed'''
738
739-__licence__ = "GPLv2"
740-__copyright__ = "2007, Lauri Taimila"
741-__author__ = "Lauri Taimila <lauri@taimila.com>"
742-
743 import pango
744
745 from entertainerlib.frontend.gui.screens.screen import Screen
746
747=== modified file 'entertainerlib/frontend/gui/screens/feed_entry.py'
748--- entertainerlib/frontend/gui/screens/feed_entry.py 2009-04-27 03:32:30 +0000
749+++ entertainerlib/frontend/gui/screens/feed_entry.py 2009-05-06 03:40:22 +0000
750@@ -1,9 +1,6 @@
751+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
752 '''FeedEntry - Screen displays one entry of some RSS feed'''
753
754-__licence__ = "GPLv2"
755-__copyright__ = "2007, Lauri Taimila"
756-__author__ = "Lauri Taimila <lauri@taimila.com>"
757-
758 import pango
759
760 from entertainerlib.frontend.gui.screens.screen import Screen
761
762=== modified file 'entertainerlib/frontend/gui/screens/main.py'
763--- entertainerlib/frontend/gui/screens/main.py 2009-05-05 10:44:08 +0000
764+++ entertainerlib/frontend/gui/screens/main.py 2009-05-09 17:03:51 +0000
765@@ -1,9 +1,6 @@
766+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
767 '''Main - Screen has a main menu'''
768
769-__licence__ = "GPLv2"
770-__copyright__ = "2007, Lauri Taimila"
771-__author__ = "Lauri Taimila <lauri@taimila.com>"
772-
773 import clutter
774
775 from entertainerlib.frontend.gui.screens.screen import Screen
776
777=== modified file 'entertainerlib/frontend/gui/screens/movie.py'
778--- entertainerlib/frontend/gui/screens/movie.py 2009-04-27 03:32:30 +0000
779+++ entertainerlib/frontend/gui/screens/movie.py 2009-05-06 03:40:22 +0000
780@@ -1,9 +1,6 @@
781+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
782 '''Movie - Screen allows user to view movie information'''
783
784-__licence__ = "GPLv2"
785-__copyright__ = "2007, Lauri Taimila"
786-__author__ = "Lauri Taimila <lauri@taimila.com>"
787-
788 import clutter
789 import gtk
790 import pango
791
792=== modified file 'entertainerlib/frontend/gui/screens/music.py'
793--- entertainerlib/frontend/gui/screens/music.py 2009-04-27 03:32:30 +0000
794+++ entertainerlib/frontend/gui/screens/music.py 2009-05-06 03:40:22 +0000
795@@ -1,9 +1,6 @@
796+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
797 '''Music - Screen allows user to select music he/she wants to listen'''
798
799-__licence__ = "GPLv2"
800-__copyright__ = "2007, Lauri Taimila"
801-__author__ = "Lauri Taimila <lauri@taimila.com>"
802-
803 from entertainerlib.frontend.gui.screens.screen import Screen
804 from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
805 from entertainerlib.frontend.gui.tabs.artists_tab import ArtistsTab
806
807=== modified file 'entertainerlib/frontend/gui/screens/photo.py'
808--- entertainerlib/frontend/gui/screens/photo.py 2009-04-27 03:32:30 +0000
809+++ entertainerlib/frontend/gui/screens/photo.py 2009-05-06 03:40:22 +0000
810@@ -1,9 +1,6 @@
811+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
812 '''Photo - Screen displays photograph in fullscreen'''
813
814-__licence__ = "GPLv2"
815-__copyright__ = "2007, Lauri Taimila"
816-__author__ = "Lauri Taimila <lauri@taimila.com>"
817-
818 import clutter
819 import gobject
820
821
822=== modified file 'entertainerlib/frontend/gui/screens/photo_albums.py'
823--- entertainerlib/frontend/gui/screens/photo_albums.py 2009-04-27 03:32:30 +0000
824+++ entertainerlib/frontend/gui/screens/photo_albums.py 2009-05-06 03:40:22 +0000
825@@ -1,9 +1,6 @@
826+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
827 '''PhotoAlbums - Screen contains a list of photograph albums'''
828
829-__licence__ = "GPLv2"
830-__copyright__ = "2007, Lauri Taimila"
831-__author__ = "Lauri Taimila <lauri@taimila.com>"
832-
833 import gtk
834 import pango
835 import gobject
836
837=== modified file 'entertainerlib/frontend/gui/screens/photographs.py'
838--- entertainerlib/frontend/gui/screens/photographs.py 2009-04-27 03:32:30 +0000
839+++ entertainerlib/frontend/gui/screens/photographs.py 2009-05-06 03:40:22 +0000
840@@ -1,9 +1,6 @@
841+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
842 '''Photographs - Screen contains a list/grid of photographs'''
843
844-__licence__ = "GPLv2"
845-__copyright__ = "2007, Lauri Taimila"
846-__author__ = "Lauri Taimila <lauri@taimila.com>"
847-
848 import pango
849 import clutter
850 import gobject
851
852=== modified file 'entertainerlib/frontend/gui/screens/question.py'
853--- entertainerlib/frontend/gui/screens/question.py 2009-04-27 03:32:30 +0000
854+++ entertainerlib/frontend/gui/screens/question.py 2009-05-06 01:35:19 +0000
855@@ -1,9 +1,6 @@
856+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
857 '''Question - Screen displays a question label and specified buttons.'''
858
859-__licence__ = "GPLv2"
860-__copyright__ = "2008, Teje Rodgers"
861-__author__ = "Teje Rodgers <contact@tejerodgers.com>"
862-
863 from entertainerlib.frontend.gui.screens.screen import Screen
864 from entertainerlib.frontend.gui.transitions.transition import Transition
865 from entertainerlib.frontend.gui.widgets.label import Label
866
867=== modified file 'entertainerlib/frontend/gui/screens/rss.py'
868--- entertainerlib/frontend/gui/screens/rss.py 2009-04-27 03:32:30 +0000
869+++ entertainerlib/frontend/gui/screens/rss.py 2009-05-06 03:40:22 +0000
870@@ -1,9 +1,6 @@
871+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
872 '''Rss - Screen displays RSS feeds'''
873
874-__licence__ = "GPLv2"
875-__copyright__ = "2007, Lauri Taimila"
876-__author__ = "Lauri Taimila <lauri@taimila.com>"
877-
878 import pango
879
880 from entertainerlib.frontend.gui.screens.screen import Screen
881
882=== modified file 'entertainerlib/frontend/gui/screens/screen.py'
883--- entertainerlib/frontend/gui/screens/screen.py 2009-04-30 01:16:33 +0000
884+++ entertainerlib/frontend/gui/screens/screen.py 2009-05-06 03:40:22 +0000
885@@ -1,8 +1,5 @@
886-'''Screen - Screen interface. All screens has to implement this interface!'''
887-
888-__licence__ = "GPLv2"
889-__copyright__ = "2007, Lauri Taimila"
890-__author__ = "Lauri Taimila <lauri@taimila.com>"
891+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
892+'''Screen - Screen interface. All screens have to implement this interface!'''
893
894 from collections import defaultdict
895
896
897=== modified file 'entertainerlib/frontend/gui/screens/tv_episodes.py'
898--- entertainerlib/frontend/gui/screens/tv_episodes.py 2009-04-27 03:32:30 +0000
899+++ entertainerlib/frontend/gui/screens/tv_episodes.py 2009-05-06 03:40:22 +0000
900@@ -1,9 +1,6 @@
901+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
902 '''TvEpisodes - Screen allows user to browse episodes of a season'''
903
904-__licence__ = "GPLv2"
905-__copyright__ = "2007, Lauri Taimila"
906-__author__ = "Lauri Taimila <lauri@taimila.com>"
907-
908 import gtk
909 import pango
910
911
912=== modified file 'entertainerlib/frontend/gui/screens/tv_series.py'
913--- entertainerlib/frontend/gui/screens/tv_series.py 2009-04-27 03:32:30 +0000
914+++ entertainerlib/frontend/gui/screens/tv_series.py 2009-05-06 03:40:22 +0000
915@@ -1,9 +1,6 @@
916+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
917 '''TvSeries - Screen allows user to browse seasons of one TV series'''
918
919-__licence__ = "GPLv2"
920-__copyright__ = "2007, Lauri Taimila"
921-__author__ = "Lauri Taimila <lauri@taimila.com>"
922-
923 import gtk
924
925 from entertainerlib.frontend.gui.screens.screen import Screen
926
927=== modified file 'entertainerlib/frontend/gui/screens/video.py'
928--- entertainerlib/frontend/gui/screens/video.py 2009-04-27 03:32:30 +0000
929+++ entertainerlib/frontend/gui/screens/video.py 2009-05-06 03:40:22 +0000
930@@ -1,9 +1,6 @@
931+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
932 '''Video - Screen allows user to browse video library content'''
933
934-__licence__ = "GPLv2"
935-__copyright__ = "2008, Lauri Taimila"
936-__author__ = "Lauri Taimila <lauri@taimila.com>"
937-
938 from entertainerlib.frontend.gui.screens.screen import Screen
939 from entertainerlib.frontend.gui.tabs.movies_tab import MoviesTab
940 from entertainerlib.frontend.gui.tabs.series_tab import SeriesTab
941
942=== modified file 'entertainerlib/frontend/gui/screens/video_osd.py'
943--- entertainerlib/frontend/gui/screens/video_osd.py 2009-04-27 03:32:30 +0000
944+++ entertainerlib/frontend/gui/screens/video_osd.py 2009-05-06 02:58:08 +0000
945@@ -1,9 +1,6 @@
946+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
947 '''VideoOSD - Screen is used for video playback On Screen Display'''
948
949-__licence__ = "GPLv2"
950-__copyright__ = "2007, Lauri Taimila"
951-__author__ = "Lauri Taimila <lauri@taimila.com>"
952-
953 import gobject
954 import clutter
955
956@@ -105,10 +102,7 @@
957 self.seekforward_opacity.apply(self.seekforward_texture)
958
959 def _create_progress_bar(self):
960- """
961- Create the progress bar
962- @author Joshua Scotton
963- """
964+ '''Create the progress bar.'''
965 # Current position as time stamp
966 self.current_pos = Label(0.0365, "title", 0.6, 0.9, "00:00")
967 self.add(self.current_pos)
968@@ -122,19 +116,13 @@
969 self.display_progress_bar()
970
971 def _update_progress_bar(self):
972- """
973- Update progress bar
974- @author Joshua Scotton
975- """
976+ '''Update the progress bar.'''
977 self.progress_bar.set_progress(self.media_player.get_media_position())
978 self.current_pos.set_text(self.media_player.get_media_position_string())
979 return True
980
981 def display_progress_bar(self, hide_after_delay=True):
982- """
983- This displays the progress bar for three seconds
984- @author Joshua Scotton
985- """
986+ '''Display the progress bar for three seconds.'''
987 self.progress_bar.show()
988 self.current_pos.show()
989 if self.progress_bar_timeout_key is not None:
990@@ -144,10 +132,7 @@
991 self.hide_progress_bar)
992
993 def hide_progress_bar(self):
994- """
995- This hides the progress bar
996- @author Joshua Scotton
997- """
998+ '''Hide the progress bar.'''
999 self.progress_bar.hide()
1000 self.current_pos.hide()
1001
1002
1003=== modified file 'entertainerlib/frontend/gui/screens/weather.py'
1004--- entertainerlib/frontend/gui/screens/weather.py 2009-05-06 06:16:24 +0000
1005+++ entertainerlib/frontend/gui/screens/weather.py 2009-05-09 17:03:51 +0000
1006@@ -1,9 +1,6 @@
1007+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1008 '''WeatherScreen - Screen allows user to view current weather conditions'''
1009
1010-__licence__ = "GPLv2"
1011-__copyright__ = "2008, Jamie Bennett"
1012-__author__ = "Jamie Bennett <jamie@linuxuk.org>"
1013-
1014 from entertainerlib.frontend.gui.screens.screen import Screen
1015 from entertainerlib.frontend.gui.widgets.label import Label
1016 from entertainerlib.frontend.gui.widgets.texture import Texture
1017
1018=== modified file 'entertainerlib/frontend/gui/tabs/__init__.py'
1019--- entertainerlib/frontend/gui/tabs/__init__.py 2008-06-08 02:53:33 +0000
1020+++ entertainerlib/frontend/gui/tabs/__init__.py 2009-05-06 03:40:22 +0000
1021@@ -1,1 +1,2 @@
1022+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1023 '''Frontend GUI tabs module'''
1024
1025=== modified file 'entertainerlib/frontend/gui/tabs/albums_tab.py'
1026--- entertainerlib/frontend/gui/tabs/albums_tab.py 2009-02-03 23:37:57 +0000
1027+++ entertainerlib/frontend/gui/tabs/albums_tab.py 2009-04-28 22:30:06 +0000
1028@@ -1,10 +1,7 @@
1029+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1030 '''Albums tab which displays albums and allows users to select them'''
1031 # pylint: disable-msg=W1001
1032
1033-__licence__ = "GPLv2"
1034-__copyright__ = "2008, Matt Layman"
1035-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1036-
1037 import clutter
1038 import gobject
1039 import pango
1040
1041=== modified file 'entertainerlib/frontend/gui/tabs/artists_tab.py'
1042--- entertainerlib/frontend/gui/tabs/artists_tab.py 2009-02-03 23:37:57 +0000
1043+++ entertainerlib/frontend/gui/tabs/artists_tab.py 2009-04-28 22:30:06 +0000
1044@@ -1,10 +1,7 @@
1045+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1046 '''Artists tab for the music screen'''
1047 # pylint: disable-msg=W1001
1048
1049-__licence__ = "GPLv2"
1050-__copyright__ = "2008, Matt Layman"
1051-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1052-
1053 import clutter
1054 import gobject
1055 import pango
1056
1057=== modified file 'entertainerlib/frontend/gui/tabs/lyrics_tab.py'
1058--- entertainerlib/frontend/gui/tabs/lyrics_tab.py 2009-04-21 21:04:56 +0000
1059+++ entertainerlib/frontend/gui/tabs/lyrics_tab.py 2009-05-09 17:03:51 +0000
1060@@ -1,9 +1,6 @@
1061+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1062 '''Lyrics tab for the audio play screen'''
1063
1064-__licence__ = "GPLv2"
1065-__copyright__ = "2008, Matt Layman"
1066-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1067-
1068 import pango
1069 import clutter
1070
1071
1072=== modified file 'entertainerlib/frontend/gui/tabs/movies_tab.py'
1073--- entertainerlib/frontend/gui/tabs/movies_tab.py 2009-02-03 23:37:57 +0000
1074+++ entertainerlib/frontend/gui/tabs/movies_tab.py 2009-05-06 03:40:22 +0000
1075@@ -1,9 +1,6 @@
1076+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1077 '''MoviesTab - MoviesTab is group of objects that are displayed on movie tab'''
1078
1079-__licence__ = "GPLv2"
1080-__copyright__ = "2008, Lauri Taimila"
1081-__author__ = "Lauri Taimila <lauri@taimila.com>"
1082-
1083 import clutter
1084 import gtk
1085 import pango
1086
1087=== modified file 'entertainerlib/frontend/gui/tabs/playing_tab.py'
1088--- entertainerlib/frontend/gui/tabs/playing_tab.py 2009-02-06 08:33:50 +0000
1089+++ entertainerlib/frontend/gui/tabs/playing_tab.py 2009-04-28 22:30:06 +0000
1090@@ -1,9 +1,6 @@
1091+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1092 '''Currently playing tab for the audio screen'''
1093
1094-__licence__ = "GPLv2"
1095-__copyright__ = "2008, Matt Layman"
1096-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1097-
1098 import pango
1099
1100 from entertainerlib.frontend.gui.tabs.tab import Tab
1101
1102=== modified file 'entertainerlib/frontend/gui/tabs/series_tab.py'
1103--- entertainerlib/frontend/gui/tabs/series_tab.py 2009-02-03 23:37:57 +0000
1104+++ entertainerlib/frontend/gui/tabs/series_tab.py 2009-05-06 03:40:22 +0000
1105@@ -1,9 +1,6 @@
1106+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1107 '''SeriesTab - Group of objects that are displayed on tv-series tab'''
1108
1109-__licence__ = "GPLv2"
1110-__copyright__ = "2008, Lauri Taimila"
1111-__author__ = "Lauri Taimila <lauri@taimila.com>"
1112-
1113 import clutter
1114 import gtk
1115 import pango
1116
1117=== modified file 'entertainerlib/frontend/gui/tabs/tab.py'
1118--- entertainerlib/frontend/gui/tabs/tab.py 2009-02-28 17:22:46 +0000
1119+++ entertainerlib/frontend/gui/tabs/tab.py 2009-05-06 03:40:22 +0000
1120@@ -1,9 +1,6 @@
1121+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1122 '''Tab - Tab is group of objects that are displayed on one tab'''
1123
1124-__licence__ = "GPLv2"
1125-__copyright__ = "2008, Lauri Taimila"
1126-__author__ = "Lauri Taimila <lauri@taimila.com>"
1127-
1128 import clutter
1129
1130 from entertainerlib.frontend.gui.user_event import UserEvent
1131
1132=== modified file 'entertainerlib/frontend/gui/tabs/tracks_tab.py'
1133--- entertainerlib/frontend/gui/tabs/tracks_tab.py 2009-02-03 23:37:57 +0000
1134+++ entertainerlib/frontend/gui/tabs/tracks_tab.py 2009-04-28 22:30:06 +0000
1135@@ -1,9 +1,6 @@
1136+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1137 '''Tracks tab for the artist screen'''
1138
1139-__licence__ = "GPLv2"
1140-__copyright__ = "2008, Matt Layman"
1141-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1142-
1143 import clutter
1144 import pango
1145
1146
1147=== modified file 'entertainerlib/frontend/gui/tabs/video_clips_tab.py'
1148--- entertainerlib/frontend/gui/tabs/video_clips_tab.py 2009-02-03 23:37:57 +0000
1149+++ entertainerlib/frontend/gui/tabs/video_clips_tab.py 2009-05-06 03:40:22 +0000
1150@@ -1,9 +1,6 @@
1151+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1152 '''VideoClipsTab - Group of objects that are displayed on video clips tab'''
1153
1154-__licence__ = "GPLv2"
1155-__copyright__ = "2008, Lauri Taimila"
1156-__author__ = "Lauri Taimila <lauri@taimila.com>"
1157-
1158 import os
1159
1160 import gtk
1161
1162=== modified file 'entertainerlib/frontend/gui/transitions/__init__.py'
1163--- entertainerlib/frontend/gui/transitions/__init__.py 2008-08-02 21:33:38 +0000
1164+++ entertainerlib/frontend/gui/transitions/__init__.py 2009-05-06 03:40:22 +0000
1165@@ -1,1 +1,2 @@
1166+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1167 '''Frontend GUI transitions module'''
1168
1169=== modified file 'entertainerlib/frontend/gui/transitions/factory.py'
1170--- entertainerlib/frontend/gui/transitions/factory.py 2009-02-07 17:12:21 +0000
1171+++ entertainerlib/frontend/gui/transitions/factory.py 2009-04-28 22:30:06 +0000
1172@@ -1,10 +1,7 @@
1173+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1174 '''TransitionFactory - create a transition object based on the configuration
1175 that is in the user's preferences'''
1176
1177-__licence__ = 'GPLv2'
1178-__copyright__ = '2009, Matt Layman'
1179-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
1180-
1181 from entertainerlib.frontend.gui.transitions.fade import Fade
1182 from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
1183 from entertainerlib.frontend.gui.transitions.slide import Slide
1184
1185=== modified file 'entertainerlib/frontend/gui/transitions/fade.py'
1186--- entertainerlib/frontend/gui/transitions/fade.py 2009-01-26 23:11:40 +0000
1187+++ entertainerlib/frontend/gui/transitions/fade.py 2009-05-06 03:40:22 +0000
1188@@ -1,10 +1,8 @@
1189+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1190 '''Fade - Transition to fade out old screen and fade in the new screen'''
1191
1192-__licence__ = "GPLv2"
1193-__copyright__ = "2007, Lauri Taimila"
1194-__author__ = "Lauri Taimila <lauri@taimila.com>"
1195-
1196 import clutter
1197+
1198 from entertainerlib.frontend.gui.transitions.transition import Transition
1199
1200 class Fade(Transition):
1201
1202=== modified file 'entertainerlib/frontend/gui/transitions/no_effect.py'
1203--- entertainerlib/frontend/gui/transitions/no_effect.py 2009-01-26 23:11:40 +0000
1204+++ entertainerlib/frontend/gui/transitions/no_effect.py 2009-05-06 03:40:22 +0000
1205@@ -1,9 +1,6 @@
1206+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1207 '''NoEffect - Simple change transition from screen 1 to screen 2'''
1208
1209-__licence__ = "GPLv2"
1210-__copyright__ = "2007, Lauri Taimila"
1211-__author__ = "Lauri Taimila <lauri@taimila.com>"
1212-
1213 from entertainerlib.frontend.gui.transitions.transition import Transition
1214
1215 class NoEffect(Transition):
1216
1217=== modified file 'entertainerlib/frontend/gui/transitions/slide.py'
1218--- entertainerlib/frontend/gui/transitions/slide.py 2009-04-27 02:33:38 +0000
1219+++ entertainerlib/frontend/gui/transitions/slide.py 2009-05-06 03:40:22 +0000
1220@@ -1,9 +1,6 @@
1221+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1222 '''Slide - Transition to slide out old screen and slide in the new screen'''
1223
1224-__licence__ = "GPLv2"
1225-__copyright__ = "2007, Lauri Taimila"
1226-__author__ = "Lauri Taimila <lauri@taimila.com>"
1227-
1228 import clutter
1229
1230 from entertainerlib.frontend.gui.transitions.transition import Transition
1231
1232=== modified file 'entertainerlib/frontend/gui/transitions/transition.py'
1233--- entertainerlib/frontend/gui/transitions/transition.py 2009-01-23 22:44:19 +0000
1234+++ entertainerlib/frontend/gui/transitions/transition.py 2009-05-06 03:40:22 +0000
1235@@ -1,9 +1,6 @@
1236+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1237 '''Transition - All transition effects has to implement this interface!'''
1238
1239-__licence__ = "GPLv2"
1240-__copyright__ = "2007, Lauri Taimila"
1241-__author__ = "Lauri Taimila <lauri@taimila.com>"
1242-
1243 class Transition:
1244 """
1245 Transition interface
1246
1247=== modified file 'entertainerlib/frontend/gui/transitions/zoom_and_fade.py'
1248--- entertainerlib/frontend/gui/transitions/zoom_and_fade.py 2009-01-26 23:11:40 +0000
1249+++ entertainerlib/frontend/gui/transitions/zoom_and_fade.py 2009-05-06 03:40:22 +0000
1250@@ -1,10 +1,8 @@
1251+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1252 '''ZoomAndFade - Transition to zoom and fade between screens'''
1253
1254-__licence__ = "GPLv2"
1255-__copyright__ = "2007, Lauri Taimila"
1256-__author__ = "Lauri Taimila <lauri@taimila.com>"
1257-
1258 import clutter
1259+
1260 from entertainerlib.frontend.gui.transitions.transition import Transition
1261
1262 class ZoomAndFade(Transition):
1263
1264=== modified file 'entertainerlib/frontend/gui/user_event.py'
1265--- entertainerlib/frontend/gui/user_event.py 2009-02-19 23:47:06 +0000
1266+++ entertainerlib/frontend/gui/user_event.py 2009-05-06 03:40:22 +0000
1267@@ -1,9 +1,6 @@
1268+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1269 '''UserEvent - Event generated by user action.'''
1270
1271-__licence__ = "GPLv2"
1272-__copyright__ = "2007, Lauri Taimila"
1273-__author__ = "Lauri Taimila <lauri@taimila.com>"
1274-
1275 class UserEvent:
1276 """
1277 UserEvent object wraps one event.
1278
1279=== modified file 'entertainerlib/frontend/gui/user_interface.py'
1280--- entertainerlib/frontend/gui/user_interface.py 2009-05-05 10:44:08 +0000
1281+++ entertainerlib/frontend/gui/user_interface.py 2009-05-09 17:03:51 +0000
1282@@ -1,13 +1,9 @@
1283+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1284 '''UserInterface - Main window of the Entertainer frontend'''
1285
1286 # Clutter uses _1 to represent the 1 key and pylint complains about it
1287 # pylint: disable-msg=W0212
1288
1289-__licence__ = "GPLv2"
1290-__copyright__ = "2007, Lauri Taimila, 2009, Matt Layman"
1291-__author__ = ("Lauri Taimila <lauri@taimila.com>",
1292- 'Matt Layman <laymansterms.dev@gmail.com>')
1293-
1294 from collections import defaultdict
1295 import os
1296
1297
1298=== modified file 'entertainerlib/frontend/gui/widgets/__init__.py'
1299--- entertainerlib/frontend/gui/widgets/__init__.py 2008-08-02 21:33:38 +0000
1300+++ entertainerlib/frontend/gui/widgets/__init__.py 2009-05-06 03:40:22 +0000
1301@@ -1,1 +1,2 @@
1302+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1303 '''Fronted GUI Widgets'''
1304
1305=== modified file 'entertainerlib/frontend/gui/widgets/arrow_texture.py'
1306--- entertainerlib/frontend/gui/widgets/arrow_texture.py 2008-11-13 19:56:10 +0000
1307+++ entertainerlib/frontend/gui/widgets/arrow_texture.py 2009-05-06 03:40:22 +0000
1308@@ -1,9 +1,6 @@
1309+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1310 '''Displays text in rounded rectangle box'''
1311
1312-__licence__ = "GPLv2"
1313-__copyright__ = "2007, Lauri Taimila"
1314-__author__ = "Lauri Taimila <lauri@taimila.com>"
1315-
1316 import clutter
1317 from cluttercairo import CairoTexture
1318
1319
1320=== modified file 'entertainerlib/frontend/gui/widgets/base.py'
1321--- entertainerlib/frontend/gui/widgets/base.py 2009-03-08 03:16:25 +0000
1322+++ entertainerlib/frontend/gui/widgets/base.py 2009-04-28 22:30:06 +0000
1323@@ -1,9 +1,6 @@
1324+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1325 """Base for widgets"""
1326
1327-__licence__ = "GPLv2"
1328-__copyright__ = "2008, Matt Layman"
1329-__author__ = "Matt Layman <laymansterm.dev@gmail.com>"
1330-
1331 from entertainerlib.utils.configuration import Configuration
1332
1333 class Base(object):
1334
1335=== modified file 'entertainerlib/frontend/gui/widgets/clock_label.py'
1336--- entertainerlib/frontend/gui/widgets/clock_label.py 2008-11-29 22:44:32 +0000
1337+++ entertainerlib/frontend/gui/widgets/clock_label.py 2009-05-06 02:58:08 +0000
1338@@ -1,10 +1,6 @@
1339+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1340 '''ClockLabel widget'''
1341
1342-__licence__ = "GPLv2"
1343-__copyright__ = "2007, Lauri Taimila"
1344-__author__ = ("Lauri Taimila <lauri@taimila.com>",
1345- "Matt Layman <laymansterms.dev@gmail.com>")
1346-
1347 import time
1348 import gobject
1349
1350
1351=== modified file 'entertainerlib/frontend/gui/widgets/eyecandy_texture.py'
1352--- entertainerlib/frontend/gui/widgets/eyecandy_texture.py 2008-11-17 21:54:45 +0000
1353+++ entertainerlib/frontend/gui/widgets/eyecandy_texture.py 2009-05-06 03:40:22 +0000
1354@@ -1,10 +1,8 @@
1355+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1356 '''Texture with rounded corners and reflection below'''
1357
1358-__licence__ = "GPLv2"
1359-__copyright__ = "2007, Lauri Taimila"
1360-__author__ = "Lauri Taimila <lauri@taimila.com>"
1361-
1362 import clutter
1363+
1364 from entertainerlib.frontend.gui.widgets.rounded_texture import RoundedTexture
1365 from entertainerlib.frontend.gui.widgets.reflection_texture import (
1366 ReflectionTexture)
1367
1368=== modified file 'entertainerlib/frontend/gui/widgets/grid_menu.py'
1369--- entertainerlib/frontend/gui/widgets/grid_menu.py 2009-02-08 08:44:46 +0000
1370+++ entertainerlib/frontend/gui/widgets/grid_menu.py 2009-05-06 02:58:08 +0000
1371@@ -1,9 +1,6 @@
1372+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1373 '''GridMenu contains a grid of textures and allows user to select one'''
1374
1375-__licence__ = "GPLv2"
1376-__copyright__ = "2007, Lauri Taimila"
1377-__author__ = "Lauri Taimila <lauri@taimila.com>"
1378-
1379 import clutter
1380
1381 class GridMenu(clutter.Group):
1382@@ -171,10 +168,7 @@
1383 self.itemgroup.remove_all()
1384
1385 def select(self, logical_position):
1386- """
1387- Selects the item at the passed logical_position
1388- @author Joshua Scotton
1389- """
1390+ '''Selects the item at the passed logical_position.'''
1391 # pylint: disable-msg=W0612
1392 target = ( int(logical_position / self.row_count),
1393 int(logical_position % self.row_count))
1394
1395=== modified file 'entertainerlib/frontend/gui/widgets/image_menu.py'
1396--- entertainerlib/frontend/gui/widgets/image_menu.py 2009-02-08 07:43:25 +0000
1397+++ entertainerlib/frontend/gui/widgets/image_menu.py 2009-05-06 03:40:22 +0000
1398@@ -1,9 +1,6 @@
1399+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1400 '''Implements a grid menu that contains images'''
1401
1402-__licence__ = "GPLv2"
1403-__copyright__ = "2007, Lauri Taimila"
1404-__author__ = "Lauri Taimila <lauri@taimila.com>"
1405-
1406 import clutter
1407
1408 from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
1409
1410=== modified file 'entertainerlib/frontend/gui/widgets/image_menu_item.py'
1411--- entertainerlib/frontend/gui/widgets/image_menu_item.py 2009-01-11 00:25:55 +0000
1412+++ entertainerlib/frontend/gui/widgets/image_menu_item.py 2009-05-06 02:58:08 +0000
1413@@ -1,10 +1,6 @@
1414+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1415 '''Menuitem that contains an image'''
1416
1417-__licence__ = "GPLv2"
1418-__copyright__ = "2007, Lauri Taimila, 2008, Matt Layman"
1419-__author__ = ("Lauri Taimila <lauri@taimila.com>",
1420- "Matt Layman <laymansterms.dev@gmail.com>")
1421-
1422 from entertainerlib.frontend.gui.widgets.menu_item import MenuItem
1423
1424 class ImageMenuItem(MenuItem):
1425
1426=== modified file 'entertainerlib/frontend/gui/widgets/label.py'
1427--- entertainerlib/frontend/gui/widgets/label.py 2009-03-08 03:16:25 +0000
1428+++ entertainerlib/frontend/gui/widgets/label.py 2009-04-28 22:30:06 +0000
1429@@ -1,9 +1,6 @@
1430+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1431 """Label for widget"""
1432
1433-__licence__ = "GPLv2"
1434-__copyright__ = "2008, Matt Layman"
1435-__author__ = "Matt Layman <laymansterm.dev@gmail.com>"
1436-
1437 import clutter
1438
1439 from entertainerlib.frontend.gui.widgets.base import Base
1440
1441=== modified file 'entertainerlib/frontend/gui/widgets/list_indicator.py'
1442--- entertainerlib/frontend/gui/widgets/list_indicator.py 2008-11-17 21:53:05 +0000
1443+++ entertainerlib/frontend/gui/widgets/list_indicator.py 2009-05-06 03:40:22 +0000
1444@@ -1,9 +1,6 @@
1445+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1446 '''Displays currently selected item and length of the list'''
1447
1448-__licence__ = "GPLv2"
1449-__copyright__ = "2007, Lauri Taimila"
1450-__author__ = "Lauri Taimila <lauri@taimila.com>"
1451-
1452 import clutter
1453
1454 from entertainerlib.frontend.gui.widgets.arrow_texture import ArrowTexture
1455
1456=== modified file 'entertainerlib/frontend/gui/widgets/loading_animation.py'
1457--- entertainerlib/frontend/gui/widgets/loading_animation.py 2009-01-08 19:54:33 +0000
1458+++ entertainerlib/frontend/gui/widgets/loading_animation.py 2009-05-06 03:40:22 +0000
1459@@ -1,9 +1,6 @@
1460+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1461 '''Animation widget indicates that Entertainer is loading'''
1462
1463-__licence__ = "GPLv2"
1464-__copyright__ = "2007, Lauri Taimila"
1465-__author__ = "Lauri Taimila <lauri@taimila.com>"
1466-
1467 import math
1468 import cairo
1469 import clutter
1470
1471=== modified file 'entertainerlib/frontend/gui/widgets/menu.py'
1472--- entertainerlib/frontend/gui/widgets/menu.py 2009-02-08 08:44:46 +0000
1473+++ entertainerlib/frontend/gui/widgets/menu.py 2009-05-06 03:40:22 +0000
1474@@ -1,9 +1,6 @@
1475+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1476 '''Menu has a list of menuitems and it allows user to select one of them'''
1477
1478-__licence__ = "GPLv2"
1479-__copyright__ = "2007, Lauri Taimila"
1480-__author__ = "Lauri Taimila <lauri@taimila.com>"
1481-
1482 import clutter
1483
1484 class Menu(clutter.Group):
1485
1486=== modified file 'entertainerlib/frontend/gui/widgets/menu_item.py'
1487--- entertainerlib/frontend/gui/widgets/menu_item.py 2009-01-11 00:25:55 +0000
1488+++ entertainerlib/frontend/gui/widgets/menu_item.py 2009-05-06 03:40:22 +0000
1489@@ -1,9 +1,6 @@
1490+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1491 '''Simple Menuitem'''
1492
1493-__licence__ = "GPLv2"
1494-__copyright__ = "2007, Lauri Taimila"
1495-__author__ = "Lauri Taimila <lauri@taimila.com>"
1496-
1497 import clutter
1498
1499 from entertainerlib.frontend.gui.widgets.base import Base
1500
1501=== modified file 'entertainerlib/frontend/gui/widgets/menu_overlay.py'
1502--- entertainerlib/frontend/gui/widgets/menu_overlay.py 2008-11-17 11:20:47 +0000
1503+++ entertainerlib/frontend/gui/widgets/menu_overlay.py 2009-05-06 03:40:22 +0000
1504@@ -1,9 +1,6 @@
1505+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1506 '''Texture that is displayed over video when menu is active'''
1507
1508-__licence__ = "GPLv2"
1509-__copyright__ = "2007, Lauri Taimila"
1510-__author__ = "Lauri Taimila <lauri@taimila.com>"
1511-
1512 import clutter
1513
1514 from entertainerlib.frontend.gui.widgets.texture import Texture
1515
1516=== modified file 'entertainerlib/frontend/gui/widgets/motion_buffer.py'
1517--- entertainerlib/frontend/gui/widgets/motion_buffer.py 2009-04-28 09:49:40 +0000
1518+++ entertainerlib/frontend/gui/widgets/motion_buffer.py 2009-05-09 17:03:51 +0000
1519@@ -1,9 +1,6 @@
1520+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1521 """Tools for pointer motion calculations"""
1522
1523-__licence__ = "GPLv2"
1524-__copyright__ = "2009, Samuel Buffet"
1525-__author__ = "Samuel Buffet <samuel.buffet@gmail.com>"
1526-
1527 import math
1528
1529 class MotionBuffer(object):
1530
1531=== modified file 'entertainerlib/frontend/gui/widgets/progress_bar.py'
1532--- entertainerlib/frontend/gui/widgets/progress_bar.py 2008-11-18 07:19:27 +0000
1533+++ entertainerlib/frontend/gui/widgets/progress_bar.py 2009-05-06 03:40:22 +0000
1534@@ -1,9 +1,6 @@
1535+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1536 '''Implements progress bar widget'''
1537
1538-__licence__ = "GPLv2"
1539-__copyright__ = "2008, Lauri Taimila"
1540-__author__ = "Lauri Taimila <lauri@taimila.com>"
1541-
1542 import math
1543 import clutter
1544 from cluttercairo import CairoTexture
1545
1546=== modified file 'entertainerlib/frontend/gui/widgets/reflection_texture.py'
1547--- entertainerlib/frontend/gui/widgets/reflection_texture.py 2008-10-21 19:31:48 +0000
1548+++ entertainerlib/frontend/gui/widgets/reflection_texture.py 2009-05-06 03:40:22 +0000
1549@@ -1,9 +1,6 @@
1550+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1551 '''Cairo based texture that can be used as reflection'''
1552
1553-__licence__ = "GPLv2"
1554-__copyright__ = "2008, Lauri Taimila"
1555-__author__ = "Lauri Taimila <lauri@taimila.com>"
1556-
1557 import gtk
1558 import cairo
1559 import clutter
1560
1561=== modified file 'entertainerlib/frontend/gui/widgets/rounded_texture.py'
1562--- entertainerlib/frontend/gui/widgets/rounded_texture.py 2008-11-13 19:56:10 +0000
1563+++ entertainerlib/frontend/gui/widgets/rounded_texture.py 2009-05-06 03:40:22 +0000
1564@@ -1,9 +1,6 @@
1565+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1566 '''Cairo based texture that rounds corners'''
1567
1568-__licence__ = "GPLv2"
1569-__copyright__ = "2008, Lauri Taimila"
1570-__author__ = "Lauri Taimila <lauri@taimila.com>"
1571-
1572 from cluttercairo import CairoTexture
1573 import gtk
1574
1575
1576=== modified file 'entertainerlib/frontend/gui/widgets/scroll_area.py'
1577--- entertainerlib/frontend/gui/widgets/scroll_area.py 2009-03-08 03:16:25 +0000
1578+++ entertainerlib/frontend/gui/widgets/scroll_area.py 2009-05-06 03:40:22 +0000
1579@@ -1,9 +1,6 @@
1580+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1581 '''Container that has scrollbars and allows content to be scrolled'''
1582
1583-__licence__ = "GPLv2"
1584-__copyright__ = "2007, Lauri Taimila"
1585-__author__ = "Lauri Taimila <lauri@taimila.com>"
1586-
1587 import clutter
1588
1589 from entertainerlib.frontend.gui.widgets.base import Base
1590
1591=== modified file 'entertainerlib/frontend/gui/widgets/scroll_menu.py'
1592--- entertainerlib/frontend/gui/widgets/scroll_menu.py 2009-04-28 12:18:16 +0000
1593+++ entertainerlib/frontend/gui/widgets/scroll_menu.py 2009-05-09 17:03:51 +0000
1594@@ -1,11 +1,6 @@
1595+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1596 '''Menu widget that contains text items'''
1597
1598-__licence__ = "GPLv2"
1599-__copyright__ = "2007, Lauri Taimila"
1600-__author__ = ("Lauri Taimila <lauri@taimila.com>",
1601- "Samuel Buffet <Samuel.Buffet@gmail.com>",
1602- "Joshua Scotton <josh@joshuascotton.com>")
1603-
1604 import math
1605
1606 import clutter
1607
1608=== modified file 'entertainerlib/frontend/gui/widgets/selector.py'
1609--- entertainerlib/frontend/gui/widgets/selector.py 2008-11-26 11:20:54 +0000
1610+++ entertainerlib/frontend/gui/widgets/selector.py 2009-05-06 03:40:22 +0000
1611@@ -1,9 +1,6 @@
1612+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1613 '''Simple selector texture to show current position in menu'''
1614
1615-__licence__ = "GPLv2"
1616-__copyright__ = "2007, Lauri Taimila"
1617-__author__ = "Lauri Taimila <lauri@taimila.com>"
1618-
1619 import clutter
1620
1621 from entertainerlib.frontend.gui.widgets.texture import Texture
1622
1623=== modified file 'entertainerlib/frontend/gui/widgets/special_behaviours.py'
1624--- entertainerlib/frontend/gui/widgets/special_behaviours.py 2009-04-22 14:29:58 +0000
1625+++ entertainerlib/frontend/gui/widgets/special_behaviours.py 2009-05-09 17:03:51 +0000
1626@@ -1,9 +1,6 @@
1627+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1628 '''Implementation of special clutter behaviours'''
1629
1630-__licence__ = "GPLv2"
1631-__copyright__ = "2009, Samuel Buffet"
1632-__author__ = "Samuel Buffet <Samuel.Buffet@gmail.com>"
1633-
1634 import math
1635
1636 import clutter
1637
1638=== modified file 'entertainerlib/frontend/gui/widgets/tab_group.py'
1639--- entertainerlib/frontend/gui/widgets/tab_group.py 2009-02-27 00:01:53 +0000
1640+++ entertainerlib/frontend/gui/widgets/tab_group.py 2009-05-06 03:40:22 +0000
1641@@ -1,9 +1,6 @@
1642+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1643 '''TabGroup is a group of tabs. It draws the tab bar.'''
1644
1645-__licence__ = "GPLv2"
1646-__copyright__ = "2008, Lauri Taimila"
1647-__author__ = "Lauri Taimila <lauri@taimila.com>"
1648-
1649 import clutter
1650 import pango
1651
1652
1653=== modified file 'entertainerlib/frontend/gui/widgets/text_menu.py'
1654--- entertainerlib/frontend/gui/widgets/text_menu.py 2009-02-08 07:43:25 +0000
1655+++ entertainerlib/frontend/gui/widgets/text_menu.py 2009-05-06 02:58:08 +0000
1656@@ -1,9 +1,6 @@
1657+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1658 '''Implements basic menu that contains text labels as menuitems'''
1659
1660-__licence__ = "GPLv2"
1661-__copyright__ = "2007, Lauri Taimila"
1662-__author__ = "Lauri Taimila <lauri@taimila.com>"
1663-
1664 from entertainerlib.frontend.gui.widgets.selector import Selector
1665 from entertainerlib.frontend.gui.widgets.grid_menu import GridMenu
1666
1667@@ -60,7 +57,6 @@
1668 def get_index(self, text):
1669 """
1670 Returns index of label with the text as passed, returns -1 if not found
1671- @author Joshua Scotton
1672 """
1673 for item in self.items:
1674 if item.label.get_text() == text:
1675
1676=== modified file 'entertainerlib/frontend/gui/widgets/text_menu_item.py'
1677--- entertainerlib/frontend/gui/widgets/text_menu_item.py 2008-11-25 23:20:28 +0000
1678+++ entertainerlib/frontend/gui/widgets/text_menu_item.py 2009-05-06 03:40:22 +0000
1679@@ -1,9 +1,6 @@
1680+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1681 '''Simple menuitem that contains a text self.label (and optionl extras)'''
1682
1683-__licence__ = "GPLv2"
1684-__copyright__ = "2007, Lauri Taimila"
1685-__author__ = "Lauri Taimila <lauri@taimila.com>"
1686-
1687 import pango
1688 import clutter
1689
1690
1691=== modified file 'entertainerlib/frontend/gui/widgets/texture.py'
1692--- entertainerlib/frontend/gui/widgets/texture.py 2009-03-08 03:16:25 +0000
1693+++ entertainerlib/frontend/gui/widgets/texture.py 2009-04-28 22:30:06 +0000
1694@@ -1,9 +1,6 @@
1695+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1696 """Texture widget"""
1697
1698-__licence__ = "GPLv2"
1699-__copyright__ = "2008, Matt Layman"
1700-__author__ = "Matt Layman <laymansterm.dev@gmail.com>"
1701-
1702 import clutter
1703
1704 from entertainerlib.frontend.gui.widgets.base import Base
1705
1706=== modified file 'entertainerlib/frontend/media_player.py'
1707--- entertainerlib/frontend/media_player.py 2009-04-21 16:34:34 +0000
1708+++ entertainerlib/frontend/media_player.py 2009-05-09 17:03:51 +0000
1709@@ -1,9 +1,6 @@
1710+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1711 '''MediaPlayer - MediaPlayer that plays audio and video streams'''
1712
1713-__licence__ = "GPLv2"
1714-__copyright__ = "2007, Lauri Taimila"
1715-__author__ = "Lauri Taimila <lauri@taimila.com>"
1716-
1717 # import order is important here since Clutter 0.8,
1718 # see the pyclutter README for details
1719
1720@@ -322,7 +319,6 @@
1721 """
1722 Returns the title of the playing media.
1723 @return: String
1724- @author: Joshua Scotton
1725 """
1726 return self.media.get_title()
1727
1728
1729=== modified file 'entertainerlib/frontend/medialibrary/__init__.py'
1730--- entertainerlib/frontend/medialibrary/__init__.py 2008-08-02 21:33:38 +0000
1731+++ entertainerlib/frontend/medialibrary/__init__.py 2009-05-06 03:40:22 +0000
1732@@ -1,2 +1,3 @@
1733+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1734 '''Media library handlers'''
1735
1736
1737=== modified file 'entertainerlib/frontend/medialibrary/feeds.py'
1738--- entertainerlib/frontend/medialibrary/feeds.py 2009-01-26 18:28:26 +0000
1739+++ entertainerlib/frontend/medialibrary/feeds.py 2009-05-06 02:58:08 +0000
1740@@ -1,10 +1,6 @@
1741+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1742 '''FeedLibrary - Library for RSS-feeds'''
1743
1744-__licence__ = "GPLv2"
1745-__copyright__ = "2007, Lauri Taimila, 2008, Joshua Scotton"
1746-__author__ = "Lauri Taimila <lauri@taimila.com>, "
1747-__author__ += "Joshua Scotton <josh@joshuascotton.com>"
1748-
1749 from pysqlite2 import dbapi2 as sqlite
1750
1751 from entertainerlib.utils.configuration import Configuration
1752
1753=== modified file 'entertainerlib/frontend/medialibrary/images.py'
1754--- entertainerlib/frontend/medialibrary/images.py 2009-01-31 17:57:51 +0000
1755+++ entertainerlib/frontend/medialibrary/images.py 2009-05-06 03:40:22 +0000
1756@@ -1,9 +1,6 @@
1757+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1758 '''Image Library - Interface for Entertainer image library cache'''
1759
1760-__licence__ = "GPLv2"
1761-__copyright__ = "2007, Lauri Taimila"
1762-__author__ = "Lauri Taimila <lauri@taimila.com>"
1763-
1764 import os
1765 from pysqlite2 import dbapi2 as sqlite
1766
1767
1768=== modified file 'entertainerlib/frontend/medialibrary/music.py'
1769--- entertainerlib/frontend/medialibrary/music.py 2009-03-15 16:01:39 +0000
1770+++ entertainerlib/frontend/medialibrary/music.py 2009-05-06 03:40:22 +0000
1771@@ -1,9 +1,6 @@
1772+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1773 '''Music Library - Interface for Entertainer music library cache'''
1774
1775-__licence__ = "GPLv2"
1776-__copyright__ = "2007, Lauri Taimila"
1777-__author__ = "Lauri Taimila <lauri@taimila.com>"
1778-
1779 import os
1780 import CDDB, DiscID
1781 from pysqlite2 import dbapi2 as sqlite
1782
1783=== modified file 'entertainerlib/frontend/medialibrary/playable.py'
1784--- entertainerlib/frontend/medialibrary/playable.py 2008-12-14 20:08:09 +0000
1785+++ entertainerlib/frontend/medialibrary/playable.py 2009-05-06 02:58:08 +0000
1786@@ -1,9 +1,6 @@
1787+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1788 '''Playable - Interface for playable streams. MediaPlayer plays Playables'''
1789
1790-__licence__ = "GPLv2"
1791-__copyright__ = "2007, Lauri Taimila"
1792-__author__ = "Lauri Taimila <lauri@taimila.com>"
1793-
1794 class Playable:
1795 """
1796 Interface for playable media.
1797@@ -39,7 +36,6 @@
1798 """
1799 Gets the title of the stream.
1800 @return: String
1801- @author: Joshua Scotton
1802 """
1803 return None
1804
1805
1806=== modified file 'entertainerlib/frontend/medialibrary/playlist.py'
1807--- entertainerlib/frontend/medialibrary/playlist.py 2008-08-02 21:33:38 +0000
1808+++ entertainerlib/frontend/medialibrary/playlist.py 2009-05-06 03:40:22 +0000
1809@@ -1,9 +1,6 @@
1810+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1811 '''Playlist - Playlist class is a simple container for Playable objects'''
1812
1813-__licence__ = "GPLv2"
1814-__copyright__ = "2007, Lauri Taimila"
1815-__author__ = "Lauri Taimila <lauri@taimila.com>"
1816-
1817 import random
1818
1819 class Playlist(object):
1820
1821=== modified file 'entertainerlib/frontend/medialibrary/videos.py'
1822--- entertainerlib/frontend/medialibrary/videos.py 2009-02-01 19:15:02 +0000
1823+++ entertainerlib/frontend/medialibrary/videos.py 2009-05-06 02:58:08 +0000
1824@@ -1,10 +1,6 @@
1825+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1826 '''Video Library - Interface for Entertainer video library cache'''
1827
1828-__licence__ = "GPLv2"
1829-__copyright__ = "2007-08, Lauri Taimila, Joshua Scotton"
1830-__author__ = "Lauri Taimila <lauri@taimila.com>, "
1831-__author__ += "Joshua Scotton <josh@joshuascotton.com>"
1832-
1833 import os
1834 from pysqlite2 import dbapi2 as sqlite
1835
1836
1837=== modified file 'entertainerlib/frontend/translation_setup.py'
1838--- entertainerlib/frontend/translation_setup.py 2009-01-08 19:54:33 +0000
1839+++ entertainerlib/frontend/translation_setup.py 2009-05-06 02:02:20 +0000
1840@@ -1,11 +1,6 @@
1841 #!/usr/bin/env python
1842-"""Translation Setup Code"""
1843-
1844-__licence__ = "GPLv2"
1845-__copyright__ = "2008, Joshua Scotton, 2008, Matt Layman"
1846-__author__ = ("Joshua Scotton <josh@joshuascotton.com>",
1847- "Matt Layman <laymansterms.dev@gmail.com>")
1848-__version__ = "0.2"
1849+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1850+'''Translation Setup Code'''
1851
1852 import os
1853
1854
1855=== modified file 'entertainerlib/storage/__init__.py'
1856--- entertainerlib/storage/__init__.py 2009-02-06 06:52:14 +0000
1857+++ entertainerlib/storage/__init__.py 2009-05-06 03:40:22 +0000
1858@@ -1,3 +1,4 @@
1859+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1860 '''Storage facilities for Entertainer (used by the client/frontend).'''
1861 # pylint: disable-msg=W0611
1862 from entertainerlib.storage.base import Storage
1863
1864=== modified file 'entertainerlib/storage/base.py'
1865--- entertainerlib/storage/base.py 2009-02-06 06:34:20 +0000
1866+++ entertainerlib/storage/base.py 2009-05-06 03:40:22 +0000
1867@@ -1,3 +1,4 @@
1868+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1869 '''Base classes for Entertainer Storages.'''
1870
1871
1872
1873=== modified file 'entertainerlib/tests/__init__.py'
1874--- entertainerlib/tests/__init__.py 2009-02-06 07:23:29 +0000
1875+++ entertainerlib/tests/__init__.py 2009-05-06 03:40:22 +0000
1876@@ -1,3 +1,4 @@
1877+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1878 '''The Entertainer test suite'''
1879
1880 import os
1881
1882=== modified file 'entertainerlib/tests/mock.py'
1883--- entertainerlib/tests/mock.py 2009-04-28 11:49:43 +0000
1884+++ entertainerlib/tests/mock.py 2009-05-09 17:03:51 +0000
1885@@ -1,3 +1,4 @@
1886+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1887 '''Test mock objects'''
1888 # pylint: disable-msg=W0231
1889
1890
1891=== removed file 'entertainerlib/tests/test_backendserver.py'
1892--- entertainerlib/tests/test_backendserver.py 2009-01-31 21:36:56 +0000
1893+++ entertainerlib/tests/test_backendserver.py 1970-01-01 00:00:00 +0000
1894@@ -1,37 +0,0 @@
1895-'''Test backend server'''
1896-
1897-__licence__ = "GPLv2"
1898-__copyright__ = "2008, Matt Layman"
1899-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1900-
1901-#import unittest
1902-#import os
1903-#import shutil
1904-
1905-#from entertainerlib.backend.backend_server import BackendServer
1906-
1907-#class TestBackendServer(unittest.TestCase):
1908-# """This test class tests functions of the backend server"""
1909-#
1910-# def setUp(self):
1911-# self.backend = BackendServer()
1912-#
1913-# def tearDown(self):
1914-# self.backend.quitBackend()
1915-#
1916-# def testBackendServerCreateConfiguration(self):
1917-# """testBackendServerCreateConfiguration - Ensures that the
1918-# configuration directory is setup properly"""
1919-# # Rename the real config directory to backup
1920-# self.backup_path = self.backend.config_path + "_test"
1921-# if os.path.exists(self.backend.config_path):
1922-# os.rename(self.backend.config_path, self.backup_path)
1923-#
1924-# self.backend.create_configuration()
1925-# self.assertTrue(os.path.exists(self.backend.config_path))
1926-#
1927-# # Restore the existing config directory
1928-# if os.path.exists(self.backend.config_path):
1929-# shutil.rmtree(self.backend.config_path)
1930-# os.rename(self.backup_path, self.backend.config_path)
1931-
1932
1933=== modified file 'entertainerlib/tests/test_base.py'
1934--- entertainerlib/tests/test_base.py 2009-03-08 03:16:25 +0000
1935+++ entertainerlib/tests/test_base.py 2009-04-28 22:30:06 +0000
1936@@ -1,9 +1,6 @@
1937+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1938 """Tests Base"""
1939
1940-__license__ = "GPLv2"
1941-__copyright__ = "2008, Matt Layman"
1942-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1943-
1944 from entertainerlib.frontend.gui.widgets.base import Base
1945 from entertainerlib.tests import EntertainerTest
1946
1947
1948=== modified file 'entertainerlib/tests/test_configuration.py'
1949--- entertainerlib/tests/test_configuration.py 2009-03-08 03:16:25 +0000
1950+++ entertainerlib/tests/test_configuration.py 2009-04-28 22:30:06 +0000
1951@@ -1,10 +1,7 @@
1952+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1953 '''Tests Configuration'''
1954 # pylint: disable-msg=W0212
1955
1956-__license__ = "GPLv2"
1957-__copyright__ = "2008, Matt Layman"
1958-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1959-
1960 import os
1961
1962 from entertainerlib.tests import EntertainerTest
1963
1964=== modified file 'entertainerlib/tests/test_connection.py'
1965--- entertainerlib/tests/test_connection.py 2009-01-31 21:36:56 +0000
1966+++ entertainerlib/tests/test_connection.py 2009-04-28 22:30:06 +0000
1967@@ -1,9 +1,6 @@
1968+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1969 "Tests ConnectionServer"
1970
1971-__license__ = "GPLv2"
1972-__copyright__ = "2008, Matt Layman"
1973-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
1974-
1975 import socket
1976
1977 from entertainerlib.backend.core.connection_server import ConnectionServer
1978
1979=== modified file 'entertainerlib/tests/test_database.py'
1980--- entertainerlib/tests/test_database.py 2009-01-31 21:36:56 +0000
1981+++ entertainerlib/tests/test_database.py 2009-04-28 22:36:38 +0000
1982@@ -1,9 +1,6 @@
1983+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1984 '''Test for backend.core.db.connection'''
1985
1986-__license__ = 'GPLv2'
1987-__copyright__ = 'Paul Hummer'
1988-__author__ = 'Paul Hummer <paul.hummer@canonical.com>'
1989-
1990 import os
1991
1992 from storm.locals import Store
1993
1994=== modified file 'entertainerlib/tests/test_feedconfigtools.py'
1995--- entertainerlib/tests/test_feedconfigtools.py 2009-02-08 07:01:25 +0000
1996+++ entertainerlib/tests/test_feedconfigtools.py 2009-05-06 02:02:20 +0000
1997@@ -1,9 +1,6 @@
1998+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
1999 '''Test FeedConfigTools'''
2000
2001-__licence__ = "GPLv2"
2002-__copyright__ = "2008, Joshua Scotton"
2003-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2004-
2005 import os
2006
2007 import gtk
2008
2009=== modified file 'entertainerlib/tests/test_feedentryparser.py'
2010--- entertainerlib/tests/test_feedentryparser.py 2009-02-08 07:01:25 +0000
2011+++ entertainerlib/tests/test_feedentryparser.py 2009-05-06 02:02:20 +0000
2012@@ -1,20 +1,17 @@
2013+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2014 '''Test feed entry parser'''
2015 # pylint: disable-msg=C0301
2016
2017-__licence__ = "GPLv2"
2018-__copyright__ = "2008, Joshua Scotton"
2019-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2020-
2021-import unittest
2022-
2023+from entertainerlib.tests import EntertainerTest
2024 from entertainerlib.utils.feed_utils import FeedEntryParser
2025
2026
2027-class FeedEntryParserTest(unittest.TestCase):
2028+class FeedEntryParserTest(EntertainerTest):
2029 '''Test the FeedEntryParser'''
2030
2031 def setUp(self):
2032 """Sets up everything for the test"""
2033+ EntertainerTest.setUp(self)
2034
2035 #test strings
2036 self.testString001 = "<body><b>Hello World</body></b>"
2037
2038=== modified file 'entertainerlib/tests/test_frontendfeed.py'
2039--- entertainerlib/tests/test_frontendfeed.py 2009-01-31 21:36:56 +0000
2040+++ entertainerlib/tests/test_frontendfeed.py 2009-05-06 02:02:20 +0000
2041@@ -1,9 +1,6 @@
2042+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2043 '''Tests feeds from the frontend'''
2044
2045-__licence__ = "GPLv2"
2046-__copyright__ = "2008, Joshua Scotton"
2047-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2048-
2049 from pysqlite2 import dbapi2 as sqlite
2050
2051 from entertainerlib.frontend.medialibrary.feeds import Feed
2052
2053=== modified file 'entertainerlib/tests/test_frontendfeedentry.py'
2054--- entertainerlib/tests/test_frontendfeedentry.py 2009-02-06 08:33:50 +0000
2055+++ entertainerlib/tests/test_frontendfeedentry.py 2009-05-06 02:02:20 +0000
2056@@ -1,10 +1,7 @@
2057+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2058 '''Tests feed entries on the frontend'''
2059 # pylint: disable-msg=W0212
2060
2061-__licence__ = "GPLv2"
2062-__copyright__ = "2008, Joshua Scotton"
2063-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2064-
2065 from pysqlite2 import dbapi2 as sqlite
2066
2067 from entertainerlib.frontend.medialibrary.feeds import Feed, Entry
2068
2069=== modified file 'entertainerlib/tests/test_frontendfeedlibrary.py'
2070--- entertainerlib/tests/test_frontendfeedlibrary.py 2009-02-04 04:17:37 +0000
2071+++ entertainerlib/tests/test_frontendfeedlibrary.py 2009-05-06 02:02:20 +0000
2072@@ -1,9 +1,6 @@
2073+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2074 '''Tests feed library from the frontend'''
2075
2076-__licence__ = "GPLv2"
2077-__copyright__ = "2008, Joshua Scotton"
2078-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2079-
2080 from pysqlite2 import dbapi2 as sqlite
2081
2082 from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
2083
2084=== modified file 'entertainerlib/tests/test_imagemenuitem.py'
2085--- entertainerlib/tests/test_imagemenuitem.py 2009-02-06 08:33:50 +0000
2086+++ entertainerlib/tests/test_imagemenuitem.py 2009-04-28 22:30:06 +0000
2087@@ -1,10 +1,7 @@
2088+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2089 """Tests ImageMenuItem"""
2090 # pylint: disable-msg=W0212
2091
2092-__license__ = "GPLv2"
2093-__copyright__ = "2008, Matt Layman"
2094-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2095-
2096 import os
2097
2098 from entertainerlib.frontend.gui.widgets.image_menu_item import ImageMenuItem
2099
2100=== modified file 'entertainerlib/tests/test_label.py'
2101--- entertainerlib/tests/test_label.py 2009-02-06 08:33:50 +0000
2102+++ entertainerlib/tests/test_label.py 2009-04-28 22:30:06 +0000
2103@@ -1,10 +1,7 @@
2104+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2105 """Tests Label"""
2106 # pylint: disable-msg=W0212
2107
2108-__license__ = "GPLv2"
2109-__copyright__ = "2008, Matt Layman"
2110-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2111-
2112 import clutter
2113
2114 from entertainerlib.frontend.gui.widgets.base import Base
2115
2116=== modified file 'entertainerlib/tests/test_logger.py'
2117--- entertainerlib/tests/test_logger.py 2009-01-31 21:36:56 +0000
2118+++ entertainerlib/tests/test_logger.py 2009-04-28 22:30:06 +0000
2119@@ -1,9 +1,6 @@
2120+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2121 '''Logger object tests'''
2122
2123-__license__ = 'GPLv2'
2124-__copyright__ = '2008, Matt Layman'
2125-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2126-
2127 import logging
2128
2129 from entertainerlib.tests import EntertainerTest
2130
2131=== modified file 'entertainerlib/tests/test_lyricsdownloader.py'
2132--- entertainerlib/tests/test_lyricsdownloader.py 2009-02-06 08:33:50 +0000
2133+++ entertainerlib/tests/test_lyricsdownloader.py 2009-05-09 15:45:18 +0000
2134@@ -1,22 +1,16 @@
2135+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2136 '''Tests LyricsDownloader'''
2137 # pylint: disable-msg=W0212
2138
2139-__licence__ = "GPLv2"
2140-__copyright__ = "2008, Michael Charclo"
2141-__author__ = "Michael Charclo <charclo.michael@gmail.com>"
2142-
2143-import unittest
2144 import os
2145 import urllib
2146
2147+from entertainerlib.tests import EntertainerTest
2148 from entertainerlib.utils.lyrics_downloader import LyricsDownloader
2149
2150 THIS_DIR = os.path.dirname(__file__)
2151
2152-class testLyricsDownloader(unittest.TestCase):
2153-
2154- def setUp(self):
2155- pass
2156+class testLyricsDownloader(EntertainerTest):
2157
2158 def testLyricsConstructor(self):
2159 '''testMetadataConstructor - Ensures instantiation of Lyric Downloader
2160
2161=== modified file 'entertainerlib/tests/test_messagetype.py'
2162--- entertainerlib/tests/test_messagetype.py 2009-01-31 21:36:56 +0000
2163+++ entertainerlib/tests/test_messagetype.py 2009-05-06 02:02:20 +0000
2164@@ -1,8 +1,5 @@
2165-"""MessageType test"""
2166-
2167-__license__ = 'GPLv2'
2168-__copyright__ = '2008, Joshua Scotton'
2169-__author__ = 'Joshua Scotton <josh@joshuascotton.com>'
2170+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2171+'''Test MessageType'''
2172
2173 from entertainerlib.backend.core.message_type_priority import MessageType
2174 from entertainerlib.tests import EntertainerTest
2175
2176=== modified file 'entertainerlib/tests/test_models.py'
2177--- entertainerlib/tests/test_models.py 2009-01-31 21:36:56 +0000
2178+++ entertainerlib/tests/test_models.py 2009-04-28 22:36:38 +0000
2179@@ -1,9 +1,6 @@
2180+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2181 '''Tests for all models'''
2182
2183-__license__ = 'GPLv2'
2184-__copyright__ = '2008, Paul Hummer'
2185-__author__ = 'Paul Hummer <paul.hummer@canonical.com>'
2186-
2187 from storm.locals import Store
2188
2189 from entertainerlib.backend.core.db import models
2190
2191=== modified file 'entertainerlib/tests/test_motionbuffer.py'
2192--- entertainerlib/tests/test_motionbuffer.py 2009-04-28 12:18:16 +0000
2193+++ entertainerlib/tests/test_motionbuffer.py 2009-05-09 17:03:51 +0000
2194@@ -1,9 +1,6 @@
2195+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2196 """Tests MotionBuffer"""
2197
2198-__license__ = "GPLv2"
2199-__copyright__ = "2009, Samuel Buffet"
2200-__author__ = "Samuel Buffet <samuel.buffet@gmail.com>"
2201-
2202 from entertainerlib.frontend.gui.widgets.motion_buffer import MotionBuffer
2203 from entertainerlib.tests import EntertainerTest
2204 from entertainerlib.tests.mock import MockPointerEvent
2205
2206=== modified file 'entertainerlib/tests/test_music.py'
2207--- entertainerlib/tests/test_music.py 2009-02-14 15:26:32 +0000
2208+++ entertainerlib/tests/test_music.py 2009-04-28 22:30:06 +0000
2209@@ -1,9 +1,6 @@
2210+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2211 '''Tests Music'''
2212
2213-__licence__ = "GPLv2"
2214-__copyright__ = "2008, Matt Layman"
2215-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2216-
2217 import os
2218
2219 from pysqlite2 import dbapi2 as sqlite
2220
2221=== modified file 'entertainerlib/tests/test_opmlparser.py'
2222--- entertainerlib/tests/test_opmlparser.py 2009-02-08 07:01:25 +0000
2223+++ entertainerlib/tests/test_opmlparser.py 2009-05-06 02:02:20 +0000
2224@@ -1,24 +1,22 @@
2225+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2226 '''Tests OPMLParser'''
2227 # pylint: disable-msg=C0301
2228
2229-__licence__ = "GPLv2"
2230-__copyright__ = "2008, Joshua Scotton"
2231-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2232-
2233-import unittest
2234 import os
2235 import xml.parsers.expat
2236
2237+from entertainerlib.tests import EntertainerTest
2238 from entertainerlib.utils.feed_utils import OPMLParser
2239
2240 THIS_DIR = os.path.dirname(__file__)
2241
2242
2243-class OPMLParserTest(unittest.TestCase):
2244+class OPMLParserTest(EntertainerTest):
2245 '''Test OPMLParser'''
2246
2247 def setUp(self):
2248 '''See unittest.TestCase'''
2249+ EntertainerTest.setUp(self)
2250
2251 #set up lists and paths
2252 self.testURL = "http://www.scripting.com/feeds/top100.opml"
2253
2254=== modified file 'entertainerlib/tests/test_screen.py'
2255--- entertainerlib/tests/test_screen.py 2009-04-27 23:12:40 +0000
2256+++ entertainerlib/tests/test_screen.py 2009-05-06 01:35:19 +0000
2257@@ -1,9 +1,6 @@
2258+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2259 '''Tests Screen'''
2260
2261-__license__ = "GPLv2"
2262-__copyright__ = "2008, Matt Layman"
2263-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2264-
2265 import clutter
2266
2267 from entertainerlib.exceptions import ScreenException
2268
2269=== modified file 'entertainerlib/tests/test_screenfactory.py'
2270--- entertainerlib/tests/test_screenfactory.py 2009-02-06 08:33:50 +0000
2271+++ entertainerlib/tests/test_screenfactory.py 2009-04-28 22:30:06 +0000
2272@@ -1,10 +1,7 @@
2273+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2274 '''Tests ScreenFactory'''
2275 # pylint: disable-msg=W0212
2276
2277-__license__ = 'GPLv2'
2278-__copyright__ = '2009, Matt Layman'
2279-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2280-
2281 import os
2282
2283 from entertainerlib.frontend.gui.screens.album import Album
2284
2285=== modified file 'entertainerlib/tests/test_scrollarea.py'
2286--- entertainerlib/tests/test_scrollarea.py 2009-02-06 08:13:48 +0000
2287+++ entertainerlib/tests/test_scrollarea.py 2009-04-28 22:30:06 +0000
2288@@ -1,9 +1,6 @@
2289+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2290 """Tests ScrollArea"""
2291
2292-__license__ = "GPLv2"
2293-__copyright__ = "2008, Matt Layman"
2294-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2295-
2296 import clutter
2297
2298 from entertainerlib.frontend.gui.widgets.base import Base
2299
2300=== modified file 'entertainerlib/tests/test_scrollmenu.py'
2301--- entertainerlib/tests/test_scrollmenu.py 2009-04-28 12:18:16 +0000
2302+++ entertainerlib/tests/test_scrollmenu.py 2009-05-09 17:03:51 +0000
2303@@ -1,9 +1,6 @@
2304+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2305 """Tests ScrollMenu"""
2306
2307-__license__ = "GPLv2"
2308-__copyright__ = "2009, Samuel Buffet"
2309-__author__ = "Samuel Buffet <samuel.buffet@gmail.com>"
2310-
2311 import time
2312
2313 from entertainerlib.frontend.gui.widgets.scroll_menu import ScrollMenu
2314
2315=== modified file 'entertainerlib/tests/test_storage.py'
2316--- entertainerlib/tests/test_storage.py 2009-02-10 04:54:36 +0000
2317+++ entertainerlib/tests/test_storage.py 2009-05-06 03:40:22 +0000
2318@@ -1,5 +1,7 @@
2319+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2320 '''Test the Storage classes.'''
2321 # pylint: disable-msg=W0704,W0612
2322+
2323 from entertainerlib.storage import Storage
2324 from entertainerlib.tests import EntertainerTest
2325
2326
2327=== modified file 'entertainerlib/tests/test_texture.py'
2328--- entertainerlib/tests/test_texture.py 2009-02-06 08:33:50 +0000
2329+++ entertainerlib/tests/test_texture.py 2009-04-28 22:30:06 +0000
2330@@ -1,10 +1,7 @@
2331+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2332 """Tests Texture"""
2333 # pylint: disable-msg=W0212
2334
2335-__license__ = "GPLv2"
2336-__copyright__ = "2008, Matt Layman"
2337-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2338-
2339 import os
2340
2341 import clutter
2342
2343=== modified file 'entertainerlib/tests/test_theme.py'
2344--- entertainerlib/tests/test_theme.py 2009-01-31 21:36:56 +0000
2345+++ entertainerlib/tests/test_theme.py 2009-04-28 22:30:06 +0000
2346@@ -1,9 +1,6 @@
2347+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2348 """Tests Theme"""
2349
2350-__license__ = "GPLv2"
2351-__copyright__ = "2008, Matt Layman"
2352-__author__ = "Matt Layman <laymansterms.dev@gmail.com>"
2353-
2354 from entertainerlib.tests import EntertainerTest
2355 from entertainerlib.utils.theme import Theme
2356
2357
2358=== modified file 'entertainerlib/tests/test_thumbnailer.py'
2359--- entertainerlib/tests/test_thumbnailer.py 2009-02-19 14:41:03 +0000
2360+++ entertainerlib/tests/test_thumbnailer.py 2009-05-06 03:40:22 +0000
2361@@ -1,3 +1,4 @@
2362+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2363 '''Thumbnailer tests.'''
2364 # pylint: disable-msg=W0212
2365
2366
2367=== modified file 'entertainerlib/tests/test_transitionfactory.py'
2368--- entertainerlib/tests/test_transitionfactory.py 2009-02-07 17:12:21 +0000
2369+++ entertainerlib/tests/test_transitionfactory.py 2009-04-28 22:30:06 +0000
2370@@ -1,10 +1,7 @@
2371+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2372 '''Tests TransitionFactory'''
2373 # pylint: disable-msg=W0212
2374
2375-__license__ = 'GPLv2'
2376-__copyright__ = '2009, Matt Layman'
2377-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2378-
2379 from entertainerlib.frontend.gui.transitions.factory import TransitionFactory
2380 from entertainerlib.frontend.gui.transitions.fade import Fade
2381 from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
2382
2383=== modified file 'entertainerlib/tests/test_userinterface.py'
2384--- entertainerlib/tests/test_userinterface.py 2009-04-27 23:12:40 +0000
2385+++ entertainerlib/tests/test_userinterface.py 2009-05-06 01:35:19 +0000
2386@@ -1,9 +1,6 @@
2387+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2388 '''Tests UserInterface'''
2389
2390-__license__ = 'GPLv2'
2391-__copyright__ = '2009, Matt Layman'
2392-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2393-
2394 import clutter
2395
2396 from entertainerlib.frontend.gui.screens.question import Question
2397
2398=== modified file 'entertainerlib/tests/test_videometadatasearch.py'
2399--- entertainerlib/tests/test_videometadatasearch.py 2009-01-31 21:36:56 +0000
2400+++ entertainerlib/tests/test_videometadatasearch.py 2009-05-09 15:45:18 +0000
2401@@ -1,22 +1,14 @@
2402+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2403 '''Tests VideoMetadataSearch'''
2404
2405-__licence__ = "GPLv2"
2406-__copyright__ = "2008, Michael Charclo"
2407-__author__ = "Michael Charclo <charclo.michael@gmail.com>"
2408-
2409-import unittest
2410-
2411 # XXX: rockstar - Modules should not get this deep
2412 from entertainerlib.backend.components.mediacache.video_metadata_search import (
2413 VideoMetadataSearch)
2414+from entertainerlib.tests import EntertainerTest
2415
2416-class testVideoMetadataSearch(unittest.TestCase):
2417+class testVideoMetadataSearch(EntertainerTest):
2418 '''Tests VideoMetdataSearch'''
2419
2420- def setUp(self):
2421- '''See unittest.TestCase'''
2422- pass
2423-
2424 def testMetadataConstructor(self):
2425 '''testMetadataConstructor - Ensures instantiation of metadata search
2426 class'''
2427
2428=== modified file 'entertainerlib/tests/test_weather.py'
2429--- entertainerlib/tests/test_weather.py 2009-05-06 01:59:02 +0000
2430+++ entertainerlib/tests/test_weather.py 2009-05-09 17:03:51 +0000
2431@@ -1,9 +1,6 @@
2432+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2433 '''Tests Weather'''
2434
2435-__licence__ = "GPLv2"
2436-__copyright__ = "2008, Jamie Bennett"
2437-__author__ = "Jamie Bennett <jamie@linuxuk.org>"
2438-
2439 from datetime import datetime, timedelta, tzinfo
2440
2441 from entertainerlib.tests import EntertainerTest
2442@@ -13,7 +10,6 @@
2443 """
2444 WeatherTest class
2445 Tests for the weather module.
2446- @author: Jamie Bennett <jamie@linuxuk.org>
2447 """
2448 def setUp(self):
2449 """Sets up everything for the test"""
2450
2451=== modified file 'entertainerlib/thumbnailer.py'
2452--- entertainerlib/thumbnailer.py 2009-02-19 14:25:51 +0000
2453+++ entertainerlib/thumbnailer.py 2009-04-28 22:36:38 +0000
2454@@ -1,11 +1,7 @@
2455+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2456 '''Thumbnailer classes for image and video.'''
2457 # pylint: disable-msg=C0301
2458
2459-__licence__ = "GPLv2"
2460-__copyright__ = "2009, Paul Hummer"
2461-__author__ = "Paul Hummer <paul@ironlionsoftware.com>"
2462-__maintainer__ = "Paul Hummer <paul@ironlionsoftware.com>"
2463-
2464 import os
2465 from threading import Event
2466 import hashlib
2467
2468=== modified file 'entertainerlib/utils/__init__.py'
2469--- entertainerlib/utils/__init__.py 2008-08-07 01:17:29 +0000
2470+++ entertainerlib/utils/__init__.py 2009-05-06 03:40:22 +0000
2471@@ -1,1 +1,2 @@
2472+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2473 '''Entertainer utils'''
2474
2475=== modified file 'entertainerlib/utils/albumart_downloader.py'
2476--- entertainerlib/utils/albumart_downloader.py 2009-03-22 04:53:10 +0000
2477+++ entertainerlib/utils/albumart_downloader.py 2009-05-06 02:58:08 +0000
2478@@ -1,11 +1,6 @@
2479+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2480 '''AlbumArtDownloader - Search and download album art from the internet.'''
2481
2482-__licence__ = "GPLv2"
2483-__copyright__ = "2007, Lauri Taimila, "
2484-__copyright__ += "2008, Matt Layman"
2485-__author__ = "Lauri Taimila <lauri@taimila.com>, "
2486-__author__ += "Matt Layman <laymansterms.dev@gmail.com"
2487-
2488 import os
2489 import re
2490 import locale
2491
2492=== modified file 'entertainerlib/utils/cd_utils.py'
2493--- entertainerlib/utils/cd_utils.py 2008-06-16 04:10:47 +0000
2494+++ entertainerlib/utils/cd_utils.py 2009-05-06 02:02:20 +0000
2495@@ -1,10 +1,7 @@
2496+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2497 '''Utilities for handling the cd'''
2498 # XXX: rockstar - Why do we have module for a single function?
2499
2500-__licence__ = "GPLv2"
2501-__copyright__ = "2008, Joshua Scotton"
2502-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2503-
2504 import os
2505
2506 def eject_cd():
2507
2508=== modified file 'entertainerlib/utils/configuration.py'
2509--- entertainerlib/utils/configuration.py 2009-03-08 21:29:32 +0000
2510+++ entertainerlib/utils/configuration.py 2009-05-06 02:58:08 +0000
2511@@ -1,10 +1,6 @@
2512+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2513 '''Configuration - Class represents Entertainer's configuration'''
2514
2515-__licence__ = "GPLv2"
2516-__copyright__ = ("2007, Lauri Taimila", "2008, Matt Layman")
2517-__author__ = ("Lauri Taimila <lauri@taimila.com>",
2518- "Matt Layman <laymansterms.dev@gmail.com>")
2519-
2520 import os
2521 import sys
2522 import shutil
2523@@ -348,7 +344,6 @@
2524 """
2525 Should we display the cd eject button in frontend
2526 @return: Boolean
2527- @author: Joshua Scotton
2528 """
2529 try:
2530 result = self.content_config.getboolean("CD",
2531
2532=== modified file 'entertainerlib/utils/content_management_dialog.py'
2533--- entertainerlib/utils/content_management_dialog.py 2009-04-17 21:35:32 +0000
2534+++ entertainerlib/utils/content_management_dialog.py 2009-05-06 02:58:08 +0000
2535@@ -1,11 +1,7 @@
2536 #!/usr/bin/env python
2537+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2538 '''Content management GUI for Entertainer'''
2539
2540-__licence__ = "GPLv2"
2541-__copyright__ = "2008, Lauri Taimila and Joshua Scotton"
2542-__author__ = ("Lauri Taimila <lauri@taimila.com>",
2543- "Joshua Scotton <josh@joshuascotton.com>")
2544-
2545 import os
2546 import socket
2547
2548
2549=== modified file 'entertainerlib/utils/feed_utils.py'
2550--- entertainerlib/utils/feed_utils.py 2009-02-08 07:43:25 +0000
2551+++ entertainerlib/utils/feed_utils.py 2009-05-06 02:02:20 +0000
2552@@ -1,9 +1,6 @@
2553+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2554 '''Utilities for fetching feeds'''
2555
2556-__licence__ = "GPLv2"
2557-__copyright__ = "2008, Joshua Scotton"
2558-__author__ = "Joshua Scotton <josh@joshuascotton.com>"
2559-
2560 import os
2561 import urllib
2562 from xml.dom import minidom
2563
2564=== modified file 'entertainerlib/utils/log_viewer.py'
2565--- entertainerlib/utils/log_viewer.py 2009-01-11 19:20:27 +0000
2566+++ entertainerlib/utils/log_viewer.py 2009-05-06 02:58:08 +0000
2567@@ -1,9 +1,6 @@
2568+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2569 '''Implements dialog that allows users to see logged events'''
2570
2571-__licence__ = "GPLv2"
2572-__copyright__ = "2007, Lauri Taimila"
2573-__author__ = "Lauri Taimila <lauri@taimila.com>"
2574-
2575 import os
2576 import sys
2577
2578@@ -160,7 +157,6 @@
2579 def parse_row(row):
2580 """
2581 This parses the input list into a list suitable for the logviewer
2582- @author Joshua Scotton
2583 @param row The input list [Date, Time, Class, Type + Description]
2584 """
2585 if row[3][:5] == "DEBUG":
2586
2587=== modified file 'entertainerlib/utils/logger.py'
2588--- entertainerlib/utils/logger.py 2009-01-11 02:26:45 +0000
2589+++ entertainerlib/utils/logger.py 2009-04-28 22:30:06 +0000
2590@@ -1,9 +1,6 @@
2591+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2592 '''Logger class'''
2593
2594-__license__ = 'GPLv2'
2595-__copyright__ = '2008, Matt Layman'
2596-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2597-
2598 import logging
2599
2600 from entertainerlib.utils.configuration import Configuration
2601
2602=== modified file 'entertainerlib/utils/lyrics_downloader.py'
2603--- entertainerlib/utils/lyrics_downloader.py 2009-03-22 04:06:48 +0000
2604+++ entertainerlib/utils/lyrics_downloader.py 2009-05-09 15:45:18 +0000
2605@@ -1,9 +1,5 @@
2606-"""Search and download lyrics from the internet."""
2607-
2608-__licence__ = "GPLv2"
2609-__copyright__ = "2007, Lauri Taimila"
2610-__author__ = ("Lauri Taimila <lauri@taimila.com>",
2611- "Charclo Michael <charclo.michael@gmail.com>")
2612+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2613+'''Search and download lyrics from the internet.'''
2614
2615 import urllib
2616 import socket
2617
2618=== modified file 'entertainerlib/utils/open_feed_source_dialog.py'
2619--- entertainerlib/utils/open_feed_source_dialog.py 2009-02-07 17:12:21 +0000
2620+++ entertainerlib/utils/open_feed_source_dialog.py 2009-05-06 03:40:22 +0000
2621@@ -1,3 +1,4 @@
2622+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2623 '''Feed source reader'''
2624
2625 import os
2626
2627=== modified file 'entertainerlib/utils/preferences_dialog.py'
2628--- entertainerlib/utils/preferences_dialog.py 2009-03-21 20:31:35 +0000
2629+++ entertainerlib/utils/preferences_dialog.py 2009-05-06 03:40:22 +0000
2630@@ -1,4 +1,5 @@
2631 #!/usr/bin/env python
2632+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2633 '''Preferences editing tool for Entertainer media center'''
2634
2635 import os
2636
2637=== modified file 'entertainerlib/utils/system_tray_icon.py'
2638--- entertainerlib/utils/system_tray_icon.py 2009-02-07 00:28:11 +0000
2639+++ entertainerlib/utils/system_tray_icon.py 2009-05-06 02:58:08 +0000
2640@@ -1,9 +1,6 @@
2641+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2642 '''SystemTrayIcon class - Implements system tray icon for Entertainer.'''
2643
2644-__licence__ = "GPLv2"
2645-__copyright__ = "2007, Lauri Taimila"
2646-__author__ = "Lauri Taimila <lauri@taimila.com>"
2647-
2648 import os
2649
2650 import gtk
2651@@ -22,10 +19,7 @@
2652 GLADE_DIR = os.path.join(FILE_DIR, "glade")
2653
2654 def __init__(self, quit_callback, toggle_interface_visibility_callback):
2655- """
2656- Create system tray icon and pop-up menu for it.
2657- @author ["Joshua Scotton", "Lauri Taimila"]
2658- """
2659+ '''Create the system tray icon and pop-up menu for it.'''
2660 self.quit_callback = quit_callback
2661 self.toggle_interface_visibility_callback = \
2662 toggle_interface_visibility_callback
2663
2664=== modified file 'entertainerlib/utils/theme.py'
2665--- entertainerlib/utils/theme.py 2009-02-07 21:43:35 +0000
2666+++ entertainerlib/utils/theme.py 2009-05-06 03:40:22 +0000
2667@@ -1,9 +1,6 @@
2668+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2669 '''Theme - Theme represents currently used theme.'''
2670
2671-__licence__ = "GPLv2"
2672-__copyright__ = "2007, Lauri Taimila"
2673-__author__ = "Lauri Taimila <lauri@taimila.com>"
2674-
2675 import os
2676 import sys
2677 import ConfigParser
2678
2679=== modified file 'entertainerlib/utils/weather.py'
2680--- entertainerlib/utils/weather.py 2009-01-11 02:51:18 +0000
2681+++ entertainerlib/utils/weather.py 2009-04-28 22:45:31 +0000
2682@@ -1,11 +1,9 @@
2683+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2684 """
2685 Weather Class
2686 Uses google weathers api to get a weather forecast for the next
2687 4 days.
2688 """
2689-__licence__ = "GPLv2"
2690-__copyright__ = ("2008, Jamie Bennett", "2008, Samuel Buffet")
2691-__author__ = ("Jamie Bennett <jamie@linuxuk.org>", "Samuel Buffet")
2692
2693 import locale
2694 import urllib2
2695@@ -35,7 +33,6 @@
2696 class Weather:
2697 """
2698 Weather class
2699- @author: Jamie Bennett <jamie@linuxuk.org>
2700 """
2701
2702 def __init__(self, location=""):
2703
2704=== modified file 'setup.py'
2705--- setup.py 2009-04-07 18:45:52 +0000
2706+++ setup.py 2009-04-28 23:54:49 +0000
2707@@ -1,4 +1,5 @@
2708 #!/usr/bin/env python
2709+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2710 '''distutils installation script'''
2711
2712 from distutils import log
2713
2714=== modified file 'tools/__init__.py'
2715--- tools/__init__.py 2008-12-18 23:23:17 +0000
2716+++ tools/__init__.py 2009-05-06 03:40:22 +0000
2717@@ -1,1 +1,2 @@
2718+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2719 '''Entertainer tools'''
2720
2721=== modified file 'tools/loc.py'
2722--- tools/loc.py 2008-12-18 23:23:17 +0000
2723+++ tools/loc.py 2009-04-28 23:54:49 +0000
2724@@ -1,3 +1,4 @@
2725+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2726 '''Counts lines of code in entertainer'''
2727 import os
2728
2729
2730=== modified file 'tools/messagebus-notifier'
2731--- tools/messagebus-notifier 2009-02-26 22:58:43 +0000
2732+++ tools/messagebus-notifier 2009-05-06 02:58:08 +0000
2733@@ -1,10 +1,7 @@
2734 #!/usr/bin/env python
2735+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2736 '''A messagebus notifier tool'''
2737
2738-__licence__ = "GPLv2"
2739-__copyright__ = "2007, Lauri Taimila"
2740-__author__ = "Lauri Taimila <lauri@taimila.com>"
2741-
2742 import os
2743 import sys
2744
2745
2746=== modified file 'tools/translations_generator.py'
2747--- tools/translations_generator.py 2009-02-07 17:12:21 +0000
2748+++ tools/translations_generator.py 2009-04-28 22:30:06 +0000
2749@@ -1,9 +1,6 @@
2750+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
2751 '''Generate translations related files, pot/po/mo'''
2752
2753-__license__ = 'GPLv2'
2754-__copyright__ = '2008, Matt Layman'
2755-__author__ = 'Matt Layman <laymansterms.dev@gmail.com>'
2756-
2757 import glob
2758 import os
2759 import re

Subscribers

People subscribed via source and target branches