changeset 26:4cd8edde9e94

automatically transform module docstrings, moving legal stuff to comments a script was used to extract all copyright and license strings from the docstring and put them into comment lines above the docstring. this was done to not have the legal stuff in autogenerated docs repeated over and over again.
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 27 Feb 2011 18:11:54 +0100
parents 3e888522973b
children e4ec9dc44adc 87a2f219a310
files MoinMoin/__init__.py MoinMoin/_template.py MoinMoin/_tests/__init__.py MoinMoin/_tests/_test_template.py MoinMoin/_tests/ldap_testbase.py MoinMoin/_tests/ldap_testdata.py MoinMoin/_tests/maketestwiki.py MoinMoin/_tests/test_error.py MoinMoin/_tests/test_sourcecode.py MoinMoin/_tests/test_test_environ.py MoinMoin/_tests/test_user.py MoinMoin/_tests/test_wikiutil.py MoinMoin/_tests/wikiconfig.py MoinMoin/app.py MoinMoin/apps/admin/__init__.py MoinMoin/apps/admin/views.py MoinMoin/apps/feed/__init__.py MoinMoin/apps/feed/_tests/test_feed.py MoinMoin/apps/feed/views.py MoinMoin/apps/frontend/__init__.py MoinMoin/apps/frontend/_tests/test_frontend.py MoinMoin/apps/frontend/views.py MoinMoin/apps/misc/__init__.py MoinMoin/apps/misc/_tests/test_misc.py MoinMoin/apps/misc/views.py MoinMoin/apps/serve/__init__.py MoinMoin/apps/serve/views.py MoinMoin/auth/__init__.py MoinMoin/auth/_tests/test_ldap_login.py MoinMoin/auth/http.py MoinMoin/auth/ldap_login.py MoinMoin/auth/log.py MoinMoin/auth/openidrp.py MoinMoin/auth/smb_mount.py MoinMoin/config/__init__.py MoinMoin/config/_tests/test_defaultconfig.py MoinMoin/config/default.py MoinMoin/conftest.py MoinMoin/converter/__init__.py MoinMoin/converter/_args.py MoinMoin/converter/_args_wiki.py MoinMoin/converter/_table.py MoinMoin/converter/_tests/test__args.py MoinMoin/converter/_tests/test__args_wiki.py MoinMoin/converter/_tests/test__wiki_macro.py MoinMoin/converter/_tests/test_creole_in.py MoinMoin/converter/_tests/test_docbook_in.py MoinMoin/converter/_tests/test_docbook_out.py MoinMoin/converter/_tests/test_html_in.py MoinMoin/converter/_tests/test_html_in_out.py MoinMoin/converter/_tests/test_html_out.py MoinMoin/converter/_tests/test_include.py MoinMoin/converter/_tests/test_link.py MoinMoin/converter/_tests/test_mediawiki_in.py MoinMoin/converter/_tests/test_moinwiki19_in.py MoinMoin/converter/_tests/test_moinwiki_in.py MoinMoin/converter/_tests/test_moinwiki_in_out.py MoinMoin/converter/_tests/test_moinwiki_out.py MoinMoin/converter/_tests/test_rst_in.py MoinMoin/converter/_tests/test_rst_out.py MoinMoin/converter/_tests/test_smiley.py MoinMoin/converter/_wiki_macro.py MoinMoin/converter/archive_in.py MoinMoin/converter/audio_video_in.py MoinMoin/converter/creole_in.py MoinMoin/converter/docbook_in.py MoinMoin/converter/docbook_out.py MoinMoin/converter/everything.py MoinMoin/converter/highlight.py MoinMoin/converter/html_in.py MoinMoin/converter/html_out.py MoinMoin/converter/image_in.py MoinMoin/converter/include.py MoinMoin/converter/link.py MoinMoin/converter/macro.py MoinMoin/converter/mediawiki_in.py MoinMoin/converter/moinwiki19_in.py MoinMoin/converter/moinwiki_in.py MoinMoin/converter/moinwiki_out.py MoinMoin/converter/nonexistent_in.py MoinMoin/converter/pygments_in.py MoinMoin/converter/rst_in.py MoinMoin/converter/rst_out.py MoinMoin/converter/smiley.py MoinMoin/converter/text_csv_in.py MoinMoin/converter/text_in.py MoinMoin/datastruct/__init__.py MoinMoin/datastruct/backends/__init__.py MoinMoin/datastruct/backends/_tests/__init__.py MoinMoin/datastruct/backends/_tests/test_composite_dicts.py MoinMoin/datastruct/backends/_tests/test_composite_groups.py MoinMoin/datastruct/backends/_tests/test_config_dicts.py MoinMoin/datastruct/backends/_tests/test_config_groups.py MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py MoinMoin/datastruct/backends/_tests/test_wiki_groups.py MoinMoin/datastruct/backends/composite_dicts.py MoinMoin/datastruct/backends/composite_groups.py MoinMoin/datastruct/backends/config_dicts.py MoinMoin/datastruct/backends/config_groups.py MoinMoin/datastruct/backends/config_lazy_groups.py MoinMoin/datastruct/backends/wiki_dicts.py MoinMoin/datastruct/backends/wiki_groups.py MoinMoin/error.py MoinMoin/i18n/__init__.py MoinMoin/items/__init__.py MoinMoin/items/_tests/test_Item.py MoinMoin/log.py MoinMoin/macro/Anchor.py MoinMoin/macro/Date.py MoinMoin/macro/DateTime.py MoinMoin/macro/EditedSystemPages.py MoinMoin/macro/GetText.py MoinMoin/macro/GetVal.py MoinMoin/macro/GoTo.py MoinMoin/macro/HighlighterList.py MoinMoin/macro/InterWiki.py MoinMoin/macro/MailTo.py MoinMoin/macro/PageCount.py MoinMoin/macro/PageSize.py MoinMoin/macro/PagenameList.py MoinMoin/macro/RandomItem.py MoinMoin/macro/TemplateList.py MoinMoin/macro/Verbatim.py MoinMoin/macro/WikiConfig.py MoinMoin/macro/WikiConfigHelp.py MoinMoin/macro/__init__.py MoinMoin/macro/_base.py MoinMoin/macro/_tests/test__base.py MoinMoin/mail/__init__.py MoinMoin/mail/_tests/test_sendmail.py MoinMoin/mail/sendmail.py MoinMoin/script/__init__.py MoinMoin/script/account/__init__.py MoinMoin/script/account/create.py MoinMoin/script/account/disable.py MoinMoin/script/account/resetpw.py MoinMoin/script/index/__init__.py MoinMoin/script/index/build.py MoinMoin/script/maint/__init__.py MoinMoin/script/maint/reduce_revisions.py MoinMoin/script/maint/set_meta.py MoinMoin/script/maint/xml.py MoinMoin/script/migration/__init__.py MoinMoin/script/migration/backend.py MoinMoin/script/moin.py MoinMoin/script/old/__init__.py MoinMoin/script/old/print_stats.py MoinMoin/search/Xapian/__init__.py MoinMoin/search/Xapian/indexing.py MoinMoin/search/Xapian/search.py MoinMoin/search/Xapian/tokenizer.py MoinMoin/search/__init__.py MoinMoin/search/_tests/test_search.py MoinMoin/search/_tests/test_terms.py MoinMoin/search/_tests/test_wiki_analyzer.py MoinMoin/search/builtin.py MoinMoin/search/queryparser/__init__.py MoinMoin/search/queryparser/expressions.py MoinMoin/search/results.py MoinMoin/search/term.py MoinMoin/security/__init__.py MoinMoin/security/_tests/test_security.py MoinMoin/security/_tests/test_ticket.py MoinMoin/security/textcha.py MoinMoin/security/ticket.py MoinMoin/signalling/__init__.py MoinMoin/signalling/log.py MoinMoin/signalling/signals.py MoinMoin/storage/__init__.py MoinMoin/storage/_tests/__init__.py MoinMoin/storage/_tests/test_backends.py MoinMoin/storage/_tests/test_backends_flatfile.py MoinMoin/storage/_tests/test_backends_fs.py MoinMoin/storage/_tests/test_backends_fs19.py MoinMoin/storage/_tests/test_backends_fs2.py MoinMoin/storage/_tests/test_backends_hg.py MoinMoin/storage/_tests/test_backends_memory.py MoinMoin/storage/_tests/test_backends_router.py MoinMoin/storage/_tests/test_backends_sqla.py MoinMoin/storage/_tests/test_middleware_acl.py MoinMoin/storage/_tests/test_serialization.py MoinMoin/storage/_tests/tests_backend_api.py MoinMoin/storage/backends/__init__.py MoinMoin/storage/backends/_flatutils.py MoinMoin/storage/backends/_fsutils.py MoinMoin/storage/backends/acl.py MoinMoin/storage/backends/fileserver.py MoinMoin/storage/backends/flatfile.py MoinMoin/storage/backends/fs.py MoinMoin/storage/backends/fs19.py MoinMoin/storage/backends/fs19_logfile.py MoinMoin/storage/backends/fs2.py MoinMoin/storage/backends/hg.py MoinMoin/storage/backends/indexing.py MoinMoin/storage/backends/memory.py MoinMoin/storage/backends/router.py MoinMoin/storage/backends/sqla.py MoinMoin/storage/error.py MoinMoin/storage/serialization.py MoinMoin/themes/__init__.py MoinMoin/themes/_tests/test_navi_bar.py MoinMoin/user.py MoinMoin/util/SubProcess.py MoinMoin/util/__init__.py MoinMoin/util/_tests/test_diff3.py MoinMoin/util/_tests/test_diff_text.py MoinMoin/util/_tests/test_filesys.py MoinMoin/util/_tests/test_interwiki.py MoinMoin/util/_tests/test_iri.py MoinMoin/util/_tests/test_lock.py MoinMoin/util/_tests/test_mime.py MoinMoin/util/_tests/test_paramparser.py MoinMoin/util/_tests/test_pysupport.py MoinMoin/util/_tests/test_registry.py MoinMoin/util/_tests/test_tree.py MoinMoin/util/_tests/test_util.py MoinMoin/util/_tests/test_version.py MoinMoin/util/chartypes_create.py MoinMoin/util/clock.py MoinMoin/util/diff3.py MoinMoin/util/diff_html.py MoinMoin/util/diff_text.py MoinMoin/util/edit_lock.py MoinMoin/util/filesys.py MoinMoin/util/forms.py MoinMoin/util/interwiki.py MoinMoin/util/iri.py MoinMoin/util/kvstore.py MoinMoin/util/lock.py MoinMoin/util/mime.py MoinMoin/util/monkeypatch.py MoinMoin/util/paramparser.py MoinMoin/util/plugins.py MoinMoin/util/profile.py MoinMoin/util/pycdb.py MoinMoin/util/pysupport.py MoinMoin/util/python_compatibility.py MoinMoin/util/registry.py MoinMoin/util/send_file.py MoinMoin/util/thread_monitor.py MoinMoin/util/tree.py MoinMoin/util/version.py MoinMoin/wikiutil.py
diffstat 244 files changed, 1163 insertions(+), 926 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2000-2006 by Juergen Hermann <jh@web.de>
+# Copyright: 2002-2011 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - a wiki engine in Python.
+"""
 
-@copyright: 2000-2006 by Juergen Hermann <jh@web.de>,
-            2002-2011 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import sys
--- a/MoinMoin/_template.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_template.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2011 MoinMoin:YourNameHere
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - <short description>
 
     <what this stuff does ... - verbose enough>
-
-    @copyright: 2011 MoinMoin:YourNameHere
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
 
+
--- a/MoinMoin/_tests/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2007 MoinMoin:KarolNowak
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# Copyright: 2008, 2010 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - some common code for testing
+"""
 
-    @copyright: 2007 MoinMoin:KarolNowak,
-                2008 MoinMoin:ThomasWaldmann,
-                2008, 2010 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, shutil
 
--- a/MoinMoin/_tests/_test_template.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/_test_template.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007 MoinMoin:AlexanderSchremmer
+# Copyright: 2009 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.module_tested Tests
 
     Module names must start with 'test_' to be included in the tests.
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-                2007 MoinMoin:AlexanderSchremmer
-                2009 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 # include here the module that you want to test:
 from MoinMoin import module_tested
--- a/MoinMoin/_tests/ldap_testbase.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/ldap_testbase.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008 by Thomas Waldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     LDAPTestBase: LDAP testing support for py.test based unit tests
 
@@ -30,10 +33,8 @@
     so you need to disable apparmor by invoking this as root:
 
     # /etc/init.d/apparmor stop
+"""
 
-    @copyright: 2008 by Thomas Waldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 SLAPD_EXECUTABLE = 'slapd'  # filename of LDAP server executable - if it is not
                             # in your PATH, you have to give full path/filename.
--- a/MoinMoin/_tests/ldap_testdata.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/ldap_testdata.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - LDAP test data
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 BASEDN = "ou=testing,dc=example,dc=org"
 ROOTDN = "cn=root,%s" % BASEDN
--- a/MoinMoin/_tests/maketestwiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/maketestwiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 by Thomas Waldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - make a test wiki
 
 Usage:
 
     maketestwiki.py
+"""
 
-@copyright: 2005 by Thomas Waldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, sys, shutil, errno
 import tarfile
--- a/MoinMoin/_tests/test_error.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/test_error.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2003-2004 by Nir Soffer <nirs AT freeshell DOT org>
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.error Tests
+"""
 
-    @copyright: 2003-2004 by Nir Soffer <nirs AT freeshell DOT org>,
-                2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/_tests/test_sourcecode.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/test_sourcecode.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2006 by Armin Rigo (originally only testing for tab chars)
+# Copyright: 2007 adapted and extended (calling the PEP8 checker for most stuff) by MoinMoin:ThomasWaldmann.
+# License: MIT licensed
+
 """
 Verify that the MoinMoin source files conform (mostly) to PEP8 coding style.
 
 Additionally, we check that the files have no crlf (Windows style) line endings.
+"""
 
-@copyright: 2006 by Armin Rigo (originally only testing for tab chars),
-            2007 adapted and extended (calling the PEP8 checker for most stuff) by MoinMoin:ThomasWaldmann.
-@license: MIT licensed
-"""
 
 import re, time
 import py
--- a/MoinMoin/_tests/test_test_environ.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/test_test_environ.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 by MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Tests for our test environment
+"""
 
-    @copyright: 2009 by MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/_tests/test_user.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/test_user.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2009 by ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.user Tests
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
-                2009 by ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/_tests/test_wikiutil.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/test_wikiutil.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.wikiutil Tests
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-                2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/_tests/wikiconfig.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/_tests/wikiconfig.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2000-2004 by Juergen Hermann <jh@web.de>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - test wiki configuration
 
@@ -5,10 +8,8 @@
 
 We mostly want to have default values here, except for stuff that doesn't
 work without setting them (like data_dir).
+"""
 
-@copyright: 2000-2004 by Juergen Hermann <jh@web.de>
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 from os.path import abspath, dirname, join
--- a/MoinMoin/app.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/app.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2000-2006 by Juergen Hermann <jh@web.de>
+# Copyright: 2002-2011 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:FlorianKrupicka
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - wsgi application setup and related code
 
 Use create_app(config) to create the WSGI application (using Flask).
+"""
 
-@copyright: 2000-2006 by Juergen Hermann <jh@web.de>,
-            2002-2011 MoinMoin:ThomasWaldmann,
-            2008 MoinMoin:FlorianKrupicka,
-            2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 import os
 
 # do this early, but not in MoinMoin/__init__.py because we need to be able to
--- a/MoinMoin/apps/admin/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/admin/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - admin views package
 
     This package contains all views, templates, static files for wiki administration.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Module
 admin = Module(__name__)
--- a/MoinMoin/apps/admin/views.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/admin/views.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2001-2003 Juergen Hermann <jh@web.de>
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# Copyright: 2010 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - admin views
 
     This shows the user interface for wiki admins.
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann,
-                2001-2003 Juergen Hermann <jh@web.de>,
-                2010 MoinMoin:DiogenesAugusto,
-                2010 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import request, url_for, flash, redirect
 from flask import current_app as app
--- a/MoinMoin/apps/feed/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/feed/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - feed views package
 
     This package contains all views, templates, static files for feeds
     (like atom, ...).
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Module
 feed = Module(__name__)
--- a/MoinMoin/apps/feed/_tests/test_feed.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/feed/_tests/test_feed.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - basic tests for feeds
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 class TestFeeds(object):
     def test_global_atom(self):
--- a/MoinMoin/apps/feed/views.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/feed/views.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - feed views
 
     This contains all sort of feeds.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-                2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from datetime import datetime
 
--- a/MoinMoin/apps/frontend/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/frontend/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - frontend views package
 
     This package contains all views, templates, static files that a normal wiki
     user usually sees.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Module
 frontend = Module(__name__)
--- a/MoinMoin/apps/frontend/_tests/test_frontend.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/frontend/_tests/test_frontend.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - basic tests for frontend
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from MoinMoin.apps.frontend import views
 from werkzeug import ImmutableMultiDict
 from flask import flaskg
--- a/MoinMoin/apps/frontend/views.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/frontend/views.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2003-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:FlorianKrupicka
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - frontend views
 
     This shows the usual things users see when using the wiki.
+"""
 
-    @copyright: 2003-2010 MoinMoin:ThomasWaldmann,
-                2008 MoinMoin:FlorianKrupicka,
-                2010 MoinMoin:DiogenesAugusto
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import difflib
--- a/MoinMoin/apps/misc/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/misc/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - misc. views package
 
     This package contains misc. stuff that doesn't fit into another view category.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Module
 misc = Module(__name__)
--- a/MoinMoin/apps/misc/_tests/test_misc.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/misc/_tests/test_misc.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - basic tests for misc views
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 class TestMisc(object):
     def test_global_sitemap(self):
--- a/MoinMoin/apps/misc/views.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/misc/views.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - miscellaneous views
 
     Misc. stuff that doesn't fit into another view category.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import time
 
--- a/MoinMoin/apps/serve/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/serve/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - serve (external) static files
 
     E.g. javascript based drawing or html editors.
     We want to avoid bundling them, thus we access them somewhere on the
     filesystem outside of moin.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Module
 serve = Module(__name__)
--- a/MoinMoin/apps/serve/views.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/apps/serve/views.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - external static file serving
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import Response, abort
 from flask import send_from_directory
--- a/MoinMoin/auth/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,10 @@
+# Copyright: 2005-2006 Bastian Blank, Florian Festi
+# Copyright: MoinMoin:AlexanderSchremmer, Nick Phillips
+# Copyright: MoinMoin:FrankieChow, MoinMoin:NirSoffer
+# Copyright: 2005-2009 MoinMoin:ThomasWaldmann
+# Copyright: 2007      MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - modular authentication handling
 
@@ -119,15 +126,8 @@
     not be changed by the user in their preferences.
     You also have to give the keyword argument "auth_method" containing the
     name of the authentication method.
+"""
 
-    @copyright: 2005-2006 Bastian Blank, Florian Festi,
-                          MoinMoin:AlexanderSchremmer, Nick Phillips,
-                          MoinMoin:FrankieChow, MoinMoin:NirSoffer,
-                2005-2009 MoinMoin:ThomasWaldmann,
-                2007      MoinMoin:JohannesBerg
-
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/auth/_tests/test_ldap_login.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/_tests/test_ldap_login.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,11 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# Copyright: 2010 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.auth.ldap Tests
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann,
-                2010 MoinMoin:ReimarBauer
-
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/auth/http.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/http.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - http authentication
 
@@ -13,10 +16,8 @@
     auth = [HTTPAuthMoin()]
     # check if you want 'http' auth name in there:
     auth_methods_trusted = ['http', ]
+"""
 
-    @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/auth/ldap_login.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/ldap_login.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2006 Nick Phillips
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - LDAP / Active Directory authentication
 
@@ -11,11 +15,8 @@
     support in libldap2 (see dependency on gnutls) and also in python-ldap.
 
     TODO: allow more configuration (alias name, ...) by using callables as parameters
+"""
 
-    @copyright: 2006-2008 MoinMoin:ThomasWaldmann,
-                2006 Nick Phillips
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from MoinMoin import log
 logging = log.getLogger(__name__)
 
--- a/MoinMoin/auth/log.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/log.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - logging auth plugin
 
     This does nothing except logging the auth parameters (the password is NOT
     logged, of course).
+"""
 
-    @copyright: 2006-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/auth/openidrp.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/openidrp.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:Nichita Utiu
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - OpenID authentication
 
     This code handles login requests for openid multistage authentication.
+"""
 
-    @copyright: 2010 MoinMoin:Nichita Utiu
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/auth/smb_mount.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/auth/smb_mount.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - auth plugin for (un)mounting a smb share
 
     (u)mount a SMB server's share for username (using username/password for
     authentication at the SMB server). This can be used if you need access
     to files on some share via the wiki, but needs more code to be useful.
+"""
 
-    @copyright: 2006-2008 MoinMoin:ThomasWaldmann
-                2007 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/config/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/config/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2005-2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - site-wide configuration defaults (NOT per single wiki!)
+"""
 
-    @copyright: 2005-2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 import re
 
 # unicode: set the char types (upper, lower, digits, spaces)
--- a/MoinMoin/config/_tests/test_defaultconfig.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/config/_tests/test_defaultconfig.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.config.default Tests
+"""
 
-    @copyright: 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/config/default.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/config/default.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2005-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2008      MoinMoin:JohannesBerg
+# Copyright: 2010      MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Configuration defaults class
+"""
 
-    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2005-2010 MoinMoin:ThomasWaldmann,
-                2008      MoinMoin:JohannesBerg,
-                2010      MoinMoin:DiogenesAugusto
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import os
--- a/MoinMoin/conftest.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/conftest.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,8 @@
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2007 MoinMoin:AlexanderSchremmer
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin Testing Framework
 --------------------------
@@ -8,12 +13,8 @@
 
 Tests that require a certain configuration, like section_numbers = 1, must
 use a Config class to define the required configuration within the test class.
+"""
 
-@copyright: 2005 MoinMoin:NirSoffer,
-            2007 MoinMoin:AlexanderSchremmer,
-            2008 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 # exclude some directories from py.test test discovery, pathes relative to this file
 collect_ignore = ['static',  # same
--- a/MoinMoin/converter/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Converter support
 
@@ -12,10 +15,8 @@
   types or macro expansion.
 
 TODO: Merge with new-style macros.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from ..util.registry import RegistryBase
 
--- a/MoinMoin/converter/_args.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_args.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Arguments wrapper
+"""
 
-@copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 class Arguments(object):
--- a/MoinMoin/converter/_args_wiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_args_wiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Arguments support for wiki formats
+"""
 
-@copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/_table.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_table.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - table data to DOM conversion support
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/_tests/test__args.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test__args.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter._args
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test__args_wiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test__args_wiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter._args_wiki
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test__wiki_macro.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test__wiki_macro.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter._wiki_macro
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_creole_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_creole_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.creole_in
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test_docbook_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_docbook_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.docbook_in
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import StringIO
--- a/MoinMoin/converter/_tests/test_docbook_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_docbook_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.docbook_out
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import StringIO
--- a/MoinMoin/converter/_tests/test_html_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.html_in
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import StringIO
--- a/MoinMoin/converter/_tests/test_html_in_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_in_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.html_in and
            MoinMoin.converter.html_out.
 
            It will check that roundtrip conversion is working well.
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import StringIO
 import re
--- a/MoinMoin/converter/_tests/test_html_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_html_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2007 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.html_out
+"""
 
-@copyright: 2007 MoinMoin:BastianBlank
-            2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import StringIO
--- a/MoinMoin/converter/_tests/test_include.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_include.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.include
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test_link.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_link.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.link
+"""
 
-@copyright: 2007 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test_mediawiki_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_mediawiki_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.mediawiki_in
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_moinwiki19_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki19_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.moinwiki19_in
+"""
 
-@copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test_moinwiki_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.moinwiki_in
+"""
 
-@copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/converter/_tests/test_moinwiki_in_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_in_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for moinwiki->DOM->moinwiki using moinwiki_in and moinwiki_out converters
 
 It is merege of test_moinwiki_in and test_moinwiki_out, looks bad but works.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_moinwiki_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_moinwiki_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.moinwiki_out
+"""
 
-@copyright: 2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_rst_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_rst_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.rst_in
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_rst_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_rst_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.rst_out
+"""
 
-@copyright: 2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 import re
--- a/MoinMoin/converter/_tests/test_smiley.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_tests/test_smiley.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.converter.smiley
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import py
--- a/MoinMoin/converter/_wiki_macro.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/_wiki_macro.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2008,2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Macro and pseudo-macro handling
 
 Base class for wiki parser with macro support.
+"""
 
-@copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/converter/archive_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/archive_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Archives converter (e.g. zip, tar)
 
 Make a DOM Tree representation of an archive (== list contents of it in a table).
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from datetime import datetime
 import tarfile
--- a/MoinMoin/converter/audio_video_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/audio_video_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Audio/Video converter
 
 Convert audio/video to <object> tag for the DOM Tree.
 
 Note: currently this is quite same as image_in.
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/converter/creole_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/creole_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,8 @@
+# Copyright: 2007 MoinMoin:RadomirDopieralski (creole 0.5 implementation)
+# Copyright: 2007 MoinMoin:ThomasWaldmann (updates)
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Creole input converter
 
@@ -14,12 +19,8 @@
     * We do not allow ":" before "//" italic markup to avoid urls with
       unrecognized schemes (like wtf://server/path) triggering italic rendering
       for the rest of the paragraph.
+"""
 
-    @copyright: 2007 MoinMoin:RadomirDopieralski (creole 0.5 implementation),
-                2007 MoinMoin:ThomasWaldmann (updates)
-                2008-2010 MoinMoin:BastianBlank
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/docbook_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/docbook_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - DocBook input converter
 Converts a DocBook document into an internal document tree.
@@ -7,10 +10,8 @@
 Some elements of DocBook v4 specification are also supported
 for backward compatibility :
   * ulink
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/docbook_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/docbook_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# Copyright: table conversion based on html_out table conversion by Bastian Blank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - DocBook output converter
 Converts an internal document tree into a DocBook v5 document.
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut,
-            table conversion based on html_out table conversion by Bastian Blank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/everything.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/everything.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - converter for all items (fallback)
 
 Convert any item to a DOM Tree (we just create a link to download it).
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/converter/highlight.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/highlight.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Text highlighting converter
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/html_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/html_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - HTML input converter
 Converts an XHTML document into an internal document tree.
 
 TODO : Add support for style
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/html_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/html_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - HTML output converter
 
 Converts an internal document tree into a HTML tree.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:ValentinJaniaut
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/image_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/image_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Image converter
 
 Convert image to <object> tag for the DOM Tree.
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/converter/include.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/include.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Include handling
 
 Expands include elements in a internal Moin document.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank,
-            2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/link.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/link.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Link converter
 
 Expands all links in a internal Moin document. This includes interwiki and
 special wiki links.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/macro.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/macro.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Macro handling
 
 Expands all macro elements in a internal Moin document.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/mediawiki_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/mediawiki_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2000-2002 Juergen Hermann <jh@web.de>
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:ReimarBauer
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Media Wiki input converter
+"""
 
-@copyright: 2000-2002 Juergen Hermann <jh@web.de>,
-            2006-2008 MoinMoin:ThomasWaldmann,
-            2007 MoinMoin:ReimarBauer,
-            2008-2010 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/moinwiki19_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/moinwiki19_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2000-2002 Juergen Hermann <jh@web.de>
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:ReimarBauer
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Moin Wiki 1.9 input converter
+"""
 
-@copyright: 2000-2002 Juergen Hermann <jh@web.de>,
-            2006-2008 MoinMoin:ThomasWaldmann,
-            2007 MoinMoin:ReimarBauer,
-            2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/moinwiki_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/moinwiki_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2000-2002 Juergen Hermann <jh@web.de>
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:ReimarBauer
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Moin Wiki input converter
+"""
 
-@copyright: 2000-2002 Juergen Hermann <jh@web.de>,
-            2006-2008 MoinMoin:ThomasWaldmann,
-            2007 MoinMoin:ReimarBauer,
-            2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/moinwiki_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/moinwiki_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Moinwiki markup output converter
 
 Converts an internal document tree into moinwiki markup.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/nonexistent_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/nonexistent_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - converter for non-existing items
 
 Convert a non-existent item to the DOM Tree.
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/converter/pygments_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/pygments_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Pygments driven syntax highlighting input converter
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank,
-            2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/rst_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/rst_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,9 @@
+# Copyright: Docutils:David Goodger <goodger@python.org>
+# Copyright: 2004 Matthew Gilbert <gilbert AT voxmea DOT net>
+# Copyright: 2004 Alexander Schremmer <alex AT alexanderweb DOT de>
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - ReStructured Text input converter
 
@@ -6,13 +12,8 @@
 
 This converter based on ReStructuredText 2006-09-22.
 Works with docutils version 0.5 (2008-06-25) or higher.
+"""
 
-@copyright: Docutils:David Goodger <goodger@python.org>
-            2004 Matthew Gilbert <gilbert AT voxmea DOT net>,
-            2004 Alexander Schremmer <alex AT alexanderweb DOT de>
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/rst_out.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/rst_out.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:DmitryAndreev
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - reStructuredText markup output converter
 
 Converts an internal document tree into reStructuredText markup.
 
 This converter based on ReStructuredText 2006-09-22.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-            2010 MoinMoin:DmitryAndreev
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/smiley.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/smiley.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Smiley converter
 
 Replace all the text corresponding to a smiley, by the corresponding
 element for the DOM Tree.
+"""
 
-@copyright: 2010 MoinMoin:ValentinJaniaut,
-            2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/converter/text_csv_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/text_csv_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - CSV text data to DOM converter
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/converter/text_in.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/converter/text_in.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Simple text input converter.
 
@@ -6,11 +10,8 @@
 We keep it at MIDDLE+2 prio in the registry, one after pygments converter, so
 it is a fallback for the case we have no pygments or pygments has no support
 for the input mimetype.
+"""
 
-@copyright: 2008 MoinMoin:ThomasWaldmann,
-            2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import absolute_import
 
--- a/MoinMoin/datastruct/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - datastruct (groups and dicts) support.
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends.wiki_dicts import WikiDicts
 from MoinMoin.datastruct.backends.config_dicts import ConfigDicts
--- a/MoinMoin/datastruct/backends/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - base classes for datastructs.
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from UserDict import DictMixin
 
--- a/MoinMoin/datastruct/backends/_tests/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,13 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# Copyright: 2008 by MoinMoin:MelitaMihaljevic
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.datastruct.backends base test classes.
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-                2007 by MoinMoin:ThomasWaldmann
-                2008 by MoinMoin:MelitaMihaljevic
-                2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-
-"""
 
 from py.test import raises
 
--- a/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# Copyright: 2008 MoinMoin: MelitaMihaljevic
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin.datastruct.backends.composite_dicts test
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-            2008 MoinMoin: MelitaMihaljevic
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from py.test import raises
 
--- a/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin.datastruct.backends.composite_groups test
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from py.test import raises
 
--- a/MoinMoin/datastruct/backends/_tests/test_config_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_config_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.backends.config_dicts tests
+"""
 
-    @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from  MoinMoin.datastruct.backends._tests import DictsBackendTest
 from MoinMoin.datastruct import ConfigDicts
--- a/MoinMoin/datastruct/backends/_tests/test_config_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_config_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.backends.config_groups tests
+"""
 
-    @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends._tests import GroupsBackendTest
 from MoinMoin.datastruct import ConfigGroups
--- a/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.backends.config_lazy_groups tests
+"""
 
-    @copyright: 2009 by MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends._tests import GroupsBackendTest
 from MoinMoin.datastruct.backends.config_lazy_groups import ConfigLazyGroups
--- a/MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_wiki_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# Copyright: 2010 by MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.datastruct.backends.wiki_dicts tests
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-                2007 by MoinMoin:ThomasWaldmann,
-                2009 by MoinMoin:DmitrijsMilajevs,
-                2010 by MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends._tests import DictsBackendTest
 from MoinMoin.datastruct.backends import wiki_dicts
--- a/MoinMoin/datastruct/backends/_tests/test_wiki_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/_tests/test_wiki_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007,2009 by MoinMoin:ThomasWaldmann
+# Copyright: 2008 by MoinMoin:MelitaMihaljevic
+# Copyright: 2009 by MoinMoin:DmitrijsMilajevs
+# Copyright: 2010 by MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - MoinMoin.backends.wiki_group tests
+"""
 
-@copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-            2007,2009 by MoinMoin:ThomasWaldmann,
-            2008 by MoinMoin:MelitaMihaljevic,
-            2009 by MoinMoin:DmitrijsMilajevs,
-            2010 by MoinMoin:ReimarBauer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/datastruct/backends/composite_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/composite_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - dict access via various backends.
+"""
 
-@copyright: 2009 DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends import BaseDictsBackend, DictDoesNotExistError
 
--- a/MoinMoin/datastruct/backends/composite_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/composite_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2009 DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - group access via various backends.
 
@@ -5,10 +8,8 @@
 but composes other backends to a new one, so group definitions are
 retrieved from several backends. This allows to mix different
 backends.
+"""
 
-@copyright: 2009 DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends import BaseGroupsBackend, GroupDoesNotExistError
 
--- a/MoinMoin/datastruct/backends/config_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - config dict backend
 
 The config group backend enables you to define dicts in a configuration file.
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends import BaseDict, BaseDictsBackend, DictDoesNotExistError
 
--- a/MoinMoin/datastruct/backends/config_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - config groups backend
 
 The config_groups backend enables one to define groups and their
 members in a configuration file.
+"""
 
-@copyright: 2009 MoinMoin:DmitrijsMilajevs
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends import GreedyGroup, BaseGroupsBackend, GroupDoesNotExistError
 
--- a/MoinMoin/datastruct/backends/config_lazy_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/config_lazy_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - config group lazy backend.
 
@@ -6,10 +9,8 @@
 
     NOTE that this is proof-of-concept implementation. LDAP backend
     should be based on this concept.
+"""
 
-    @copyright: 2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.datastruct.backends import LazyGroup, LazyGroupsBackend
 
--- a/MoinMoin/datastruct/backends/wiki_dicts.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/wiki_dicts.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2003-2007 MoinMoin:ThomasWaldmann
+# Copyright: 2003 by Gustavo Niemeyer
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# Copyright: 2010 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - WikiDict functions.
+"""
 
-    @copyright: 2003-2007 MoinMoin:ThomasWaldmann,
-                2003 by Gustavo Niemeyer,
-                2009 MoinMoin:DmitrijsMilajevs,
-                2010 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 from MoinMoin.items import SOMEDICT
--- a/MoinMoin/datastruct/backends/wiki_groups.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/datastruct/backends/wiki_groups.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,8 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# Copyright: 2010 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - wiki group backend
 
@@ -7,12 +12,8 @@
 FriendsGroup. This lets MoinMoin recognize it as a group. This default
 pattern could be changed (e.g. for non-english languages etc.), see
 HelpOnConfiguration.
+"""
 
-@copyright: 2008 MoinMoin:ThomasWaldmann,
-            2009 MoinMoin:DmitrijsMilajevs,
-            2010 MoinMoin:ReimarBauer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from flask import flaskg
 from MoinMoin.items import USERGROUP
 from MoinMoin.datastruct.backends import GreedyGroup, BaseGroupsBackend, GroupDoesNotExistError
--- a/MoinMoin/error.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/error.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2004-2005 Nir Soffer <nirs@freeshell.org>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """ MoinMoin errors
 
     Supply Error class and sub classes used to raise various errors
+"""
 
-    @copyright: 2004-2005 Nir Soffer <nirs@freeshell.org>
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import sys
 
--- a/MoinMoin/i18n/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/i18n/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2011 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - i18n (internationalization) and l10n (localization) support
 
@@ -8,10 +11,8 @@
 _ == gettext
 N_ == ngettext
 L_ == lazy_gettext
+"""
 
-@copyright: 2011 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import current_app, request, flaskg
 
--- a/MoinMoin/items/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/items/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,18 +1,19 @@
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# Copyright: 2009 MoinMoin:ReimarBauer
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2009 MoinMoin:BastianBlank
+# Copyright: 2010 MoinMoin:ValentinJaniaut
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - misc. mimetype items
 
     While MoinMoin.storage cares for backend storage of items,
     this module cares for more high-level, frontend items,
     e.g. showing, editing, etc. of wiki items.
+"""
 
-    @copyright: 2009 MoinMoin:ThomasWaldmann,
-                2009 MoinMoin:ReimarBauer,
-                2009 MoinMoin:ChristopherDenter,
-                2009 MoinMoin:BastianBlank,
-                2010 MoinMoin:ValentinJaniaut,
-                2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, re, time, datetime, shutil, base64
 import tarfile
--- a/MoinMoin/items/_tests/test_Item.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/items/_tests/test_Item.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.items Tests
+"""
 
-    @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/log.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/log.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - init "logging" system
 
@@ -45,11 +49,8 @@
     The logger can optionally get configured in the logging configuration.
     If you don't configure it, some upperlevel logger (e.g. the root logger)
     will do the logging.
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann,
-                2007 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 # This is the "last resort" fallback logging configuration for the case
 # that load_config() is either not called at all or with a non-working
--- a/MoinMoin/macro/Anchor.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/Anchor.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Anchor Macro to put an anchor at the place where it is used.
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util.tree import moin_page
 from MoinMoin.macro._base import MacroInlineBase
--- a/MoinMoin/macro/Date.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/Date.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin Date macro - outputs the date for some specific point in time,
     adapted to the TZ settings of the user viewing the content.
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import time
 
--- a/MoinMoin/macro/DateTime.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/DateTime.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin DateTime macro - outputs the date and time for some specific point in time,
     adapted to the TZ settings of the user viewing the content.
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 from flaskext.babel import format_datetime
--- a/MoinMoin/macro/EditedSystemPages.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/EditedSystemPages.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2004 Nir Soffer <nirs@freeshell.org>
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     EditedSystemPages - list system pages that has been edited in this wiki.
+"""
 
-    @copyright: 2004 Nir Soffer <nirs@freeshell.org>,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 
--- a/MoinMoin/macro/GetText.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/GetText.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2001 Juergen Hermann <jh@web.de>
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Load I18N Text
 
@@ -5,11 +9,8 @@
     to insert the texts that a user actually sees on his screen into
     the description of the related features (which otherwise could
     get very confusing).
+"""
 
-    @copyright: 2001 Juergen Hermann <jh@web.de>,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.i18n import _, L_, N_
 from MoinMoin.macro._base import MacroInlineBase
--- a/MoinMoin/macro/GetVal.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/GetVal.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin GetVal macro - gets a value for a specified key from a dict.
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 
--- a/MoinMoin/macro/GoTo.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/GoTo.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - GoTo macro
 
 Provides a goto box.
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/macro/HighlighterList.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/HighlighterList.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2009 MoinMoin:EugeneSyromyatnikov
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - HighlighterList Macro
 
     A simple macro for displaying a table with list of available Pygments lexers.
 
     Usage: <<HighlighterList>>
+"""
 
-    @copyright: 2009 MoinMoin:EugeneSyromyatnikov,
-                2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import pygments.lexers
 
--- a/MoinMoin/macro/InterWiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/InterWiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007-2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     Outputs the interwiki map.
+"""
 
-    @copyright: 2007-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import current_app as app
 
--- a/MoinMoin/macro/MailTo.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/MailTo.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MailTo Macro displays an E-Mail address (either a valid mailto:
     link for logged in users or an obfuscated display as given as the macro argument.
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 
--- a/MoinMoin/macro/PageCount.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/PageCount.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2007 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     Outputs the page count of the wiki.
+"""
 
-    @copyright: 2007 MoinMoin:ThomasWaldmann
-    @copyright: 2008 MoinMoin:BastianBlank
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.macro._base import MacroInlineBase
 
--- a/MoinMoin/macro/PageSize.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/PageSize.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2002 Juergen Hermann <jh@web.de>
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - PageSize Macro displays an ordered list with page sizes and names
+"""
 
-    @copyright: 2002 Juergen Hermann <jh@web.de>,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.Page import Page
 from MoinMoin.macro._base import MacroNumberPageLinkListBase
--- a/MoinMoin/macro/PagenameList.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/PagenameList.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     PagenameList - list pages with names matching a string or regex
 
     Note: PageList is a similar thing using the search engine.
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/macro/RandomItem.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/RandomItem.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2000 Juergen Hermann <jh@web.de>
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - RandomItem Macro displays one or multiple random item links.
 
     TODO: add mimetype param and only show items matching this mimetype
+"""
 
-    @copyright: 2000 Juergen Hermann <jh@web.de>,
-                2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import random
 random.seed()
--- a/MoinMoin/macro/TemplateList.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/TemplateList.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     TemplateList - compatibility wrapper around PagenameList
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.macro.PagenameList import Macro as PNLMacro
 
--- a/MoinMoin/macro/Verbatim.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/Verbatim.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2005-2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     Outputs the text verbatimly.
+"""
 
-    @copyright: 2005-2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.macro._base import MacroInlineBase
 
--- a/MoinMoin/macro/WikiConfig.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/WikiConfig.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Show Wiki Configuration
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import current_app as app
 
--- a/MoinMoin/macro/WikiConfigHelp.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/WikiConfigHelp.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Show Wiki Configuration Help
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.i18n import _, L_, N_
 from MoinMoin.config import default as defaultconfig
--- a/MoinMoin/macro/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - New style macros
 
@@ -7,10 +10,8 @@
 tree representation of the document.
 
 TODO: Merge with converters
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import pysupport
 
--- a/MoinMoin/macro/_base.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/_base.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Macro base class
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import iri
 from MoinMoin.util.tree import moin_page, xlink
--- a/MoinMoin/macro/_tests/test__base.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/macro/_tests/test__base.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.macro._base
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 py.test.skip("test is out of sync with tested code")
--- a/MoinMoin/mail/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/mail/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Package Initialization
 
     Subpackage containing e-mail support code.
-
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
+
--- a/MoinMoin/mail/_tests/test_sendmail.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/mail/_tests/test_sendmail.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.mail.sendmail Tests
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from email.Charset import Charset, QP
 from email.Header import Header
--- a/MoinMoin/mail/sendmail.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/mail/sendmail.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2003 Juergen Hermann <jh@web.de>
+# Copyright: 2008-2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - email helper functions
+"""
 
-    @copyright: 2003 Juergen Hermann <jh@web.de>,
-                2008-2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, re
 from email.Header import Header
--- a/MoinMoin/script/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2000-2002 Juergen Hermann <jh@web.de>
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Extension Script Package
+"""
 
-    @copyright: 2000-2002 Juergen Hermann <jh@web.de>,
-                2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, sys, time
 from StringIO import StringIO
--- a/MoinMoin/script/account/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/account/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,6 +1,7 @@
+# Copyright: 2006,2011 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - User Accounts Management Scripts
+"""
 
-    @copyright: 2006,2011 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
--- a/MoinMoin/script/account/create.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/account/create.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# Copyright: 2011 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - create a user account
+"""
 
-@copyright: 2006 MoinMoin:ThomasWaldmann,
-            2011 MoinMoin:ReimarBauer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 from flask import current_app as app
--- a/MoinMoin/script/account/disable.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/account/disable.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# Copyright: 2011 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - disable a user account
+"""
 
-@copyright: 2006 MoinMoin:ThomasWaldmann,
-            2011 MoinMoin:ReimarBauer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 from flask import current_app as app
--- a/MoinMoin/script/account/resetpw.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/account/resetpw.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2011 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - set a user password
+"""
 
-@copyright: 2006 MoinMoin:ThomasWaldmann,
-            2008 MoinMoin:JohannesBerg,
-            2011 MoinMoin:ReimarBauer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 from flask import current_app as app
--- a/MoinMoin/script/index/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/index/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Fullsearch Index Script Package
 
     TODO: rename this module back to xapian when script framework is
     fixed to not confuse it with the xapian.org "xapian" module.
+"""
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import pysupport
 
--- a/MoinMoin/script/index/build.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/index/build.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006-2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - build xapian search engine's index
+"""
 
-@copyright: 2006-2009 MoinMoin:ThomasWaldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import errno
--- a/MoinMoin/script/maint/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/maint/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Maintenance Script Package
+"""
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import pysupport
 
--- a/MoinMoin/script/maint/reduce_revisions.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/maint/reduce_revisions.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2011 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Reduce Revisions of a backend
 
     This script removes all revisions but the last one from all selected items.
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter,
-                2011 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 from flask import current_app as app
--- a/MoinMoin/script/maint/set_meta.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/maint/set_meta.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2011 MoinMoin:ReimarBauer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Set Metadata of a revision
 
     This script duplicates the last revision of the selected item
     and sets or removes metadata.
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter,
-                2011 MoinMoin:ReimarBauer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 from ast import literal_eval
--- a/MoinMoin/script/maint/xml.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/maint/xml.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - XML (un)serialization of storage contents.
 
@@ -7,11 +11,8 @@
     Note that before unserializing stuff, you should first create an
     appropriate namespace_mapping in your wiki configuration so that the
     items get written to the backend where you want them.
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter,
-                2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import sys, time
 
--- a/MoinMoin/script/migration/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/migration/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Migration Script Package
+"""
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import pysupport
 
--- a/MoinMoin/script/migration/backend.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/migration/backend.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:PawelPacana
+# Copyright: 2008-2009 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - backend migration script
 
@@ -6,11 +10,8 @@
     Assumptions:
     - defined namespace_mapping in wikiconfig (Contains destination backends.)
     - defined old_instance_path in wikiconfig (may be removed after conversion)
+"""
 
-    @copyright: 2008 MoinMoin:PawelPacana,
-                2008-2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import shutil, sys
 from os.path import join
--- a/MoinMoin/script/moin.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/moin.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - "moin" is the main script command and calls other stuff as
     a sub-command.
 
     Usage: moin cmdmodule cmdname [options]
+"""
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 def run():
     from MoinMoin.script import MoinScript
--- a/MoinMoin/script/old/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/old/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,7 +1,8 @@
+# Copyright: 2004 by Thomas Waldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - misc example Scripts
-
-    @copyright: 2004 by Thomas Waldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
 
+
--- a/MoinMoin/script/old/print_stats.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/script/old/print_stats.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright: 2005 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Print statistics gathered by hotshot profiler
 
@@ -13,10 +16,8 @@
      5. Run this tool: print_stats.py moin.prof
 
     Currently CGI and twisted also have a hotshot profiler integration.
+"""
 
-    @copyright: 2005 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 def run():
     import sys
--- a/MoinMoin/search/Xapian/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/Xapian/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2006-2009 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - xapian search engine
+"""
 
-    @copyright: 2006-2009 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.search.Xapian.indexing import XapianIndex, Query, MoinSearchConnection, MoinIndexerConnection, XapianDatabaseLockError
 from MoinMoin.search.Xapian.tokenizer import WikiAnalyzer
--- a/MoinMoin/search/Xapian/indexing.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/Xapian/indexing.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2006-2009 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - xapian search engine indexing
+"""
 
-    @copyright: 2006-2009 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz,
-                2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, re
 import xapian
--- a/MoinMoin/search/Xapian/search.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/Xapian/search.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006-2009 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search engine internals
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006-2009 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 from MoinMoin import log
--- a/MoinMoin/search/Xapian/tokenizer.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/Xapian/tokenizer.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - A text analyzer for wiki syntax
+"""
 
-    @copyright: 2006-2008 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import xapian
--- a/MoinMoin/search/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search engine
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/search/_tests/test_search.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/_tests/test_search.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2005 by Nir Soffer <nirs@freeshell.org>
+# Copyright: 2007-2010 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.search Tests
 
     We exclude underlay/system pages for some search tests to save time.
+"""
 
-    @copyright: 2005 by Nir Soffer <nirs@freeshell.org>,
-                2007-2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 import os, StringIO, time
--- a/MoinMoin/search/_tests/test_terms.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/_tests/test_terms.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Term tests.
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/search/_tests/test_wiki_analyzer.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/_tests/test_wiki_analyzer.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.search.Xapian.tokenizer Tests
+"""
 
-    @copyright: 2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/search/builtin.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/builtin.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006-2009 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search engine internals
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006-2009 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import sys, os, time, errno, codecs
 
--- a/MoinMoin/search/queryparser/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/queryparser/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search query parser
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006-2008 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/search/queryparser/expressions.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/queryparser/expressions.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# Copyright: 2009 MoinMoin:DmitrijsMilajevs
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search query expressions
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006-2008 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz,
-                2009 MoinMoin:DmitrijsMilajevs
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/search/results.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/results.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2005 MoinMoin:FlorianFesti
+# Copyright: 2005 MoinMoin:NirSoffer
+# Copyright: 2005 MoinMoin:AlexanderSchremmer
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# Copyright: 2006 MoinMoin:FranzPletz
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search results processing
+"""
 
-    @copyright: 2005 MoinMoin:FlorianFesti,
-                2005 MoinMoin:NirSoffer,
-                2005 MoinMoin:AlexanderSchremmer,
-                2006 MoinMoin:ThomasWaldmann,
-                2006 MoinMoin:FranzPletz
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import StringIO, time
 
--- a/MoinMoin/search/term.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/search/term.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - search expression object representation
 
@@ -19,10 +22,8 @@
 
     TODO: Should we write some generic code for picking apart expressions
           like that?
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/security/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/security/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,10 @@
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2003-2008 MoinMoin:ThomasWaldmann
+# Copyright: 2003 Gustavo Niemeyer
+# Copyright: 2005 Oliver Graf
+# Copyright: 2007 Alexander Schremmer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Wiki Security Interface and Access Control Lists
 
@@ -9,14 +16,8 @@
 
     Then assign your new class to "SecurityPolicy" in wikiconfig;
     and I mean the class, not an instance of it!
+"""
 
-    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2003-2008 MoinMoin:ThomasWaldmann,
-                2003 Gustavo Niemeyer,
-                2005 Oliver Graf,
-                2007 Alexander Schremmer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import current_app as app
 
--- a/MoinMoin/security/_tests/test_security.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/security/_tests/test_security.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2003-2004 by Juergen Hermann <jh@web.de>
+# Copyright: 2007 by MoinMoin:ReimarBauer
+# Copyright: 2007,2009 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.security Tests
+"""
 
-    @copyright: 2003-2004 by Juergen Hermann <jh@web.de>,
-                2007 by MoinMoin:ReimarBauer,
-                2007,2009 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/security/_tests/test_ticket.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/security/_tests/test_ticket.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.security.ticket Tests
+"""
 
-    @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/security/textcha.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/security/textcha.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Text CAPTCHAs
 
@@ -14,10 +17,8 @@
      * make sure a q/a pair in the POST is for the q in the GET before
     * make some nice CSS
     * make similar changes to GUI editor
+"""
 
-    @copyright: 2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 import random
--- a/MoinMoin/security/ticket.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/security/ticket.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Tickets
 
     Tickets are usually used in forms to make sure that form submissions
     are in response to a form the same user got from moin.
+"""
 
-    @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import time
 import hmac, hashlib
--- a/MoinMoin/signalling/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/signalling/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - signalling support
 
     MoinMoin uses blinker for sending signals and letting listeners subscribe
     to signals.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 # import all signals so they can be imported from here:
 from signals import *
--- a/MoinMoin/signalling/log.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/signalling/log.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - logging signal handlers
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from signals import *
 
--- a/MoinMoin/signalling/signals.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/signalling/signals.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - signals
 
     We define all signals here to avoid typos/conflicts in the signal name.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from blinker import Namespace, ANY
 
--- a/MoinMoin/storage/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,8 @@
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Backends - Storage API Definition.
 
@@ -31,12 +36,8 @@
     that holds the revision), thus making it a StoredRevision.
     Item metadata, on the other hand, as infrequently used as it may be, is mutable.
     Hence, it can only be modified under a read lock.
+"""
 
-    @copyright: 2008 MoinMoin:ChristopherDenter,
-                2008 MoinMoin:JohannesBerg,
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import sys
--- a/MoinMoin/storage/_tests/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,6 +1,7 @@
+# Copyright: 2011 The MoinMoin development team
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Storage test package.
+"""
 
-    @copyright: 2011 The MoinMoin development team
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
--- a/MoinMoin/storage/_tests/test_backends.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,4 +1,9 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2008 MoinMoin:PawelPacana
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Backend tests
 
@@ -8,12 +13,8 @@
     This class should be inherited by descendant backend test classes.
     Add tests general for all backends here. Your backend-specific tests
     put in class inherited from this one.
+"""
 
-    @copyright: 2008 MoinMoin:PawelPacana,
-                2008 MoinMoin:ChristopherDenter,
-                2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test, re
 
--- a/MoinMoin/storage/_tests/test_backends_flatfile.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_flatfile.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - FlatFileBackend
+"""
 
-    @copyright: 2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/storage/_tests/test_backends_fs.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,10 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - FSBackend
-
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py, os, tempfile, shutil
 
--- a/MoinMoin/storage/_tests/test_backends_fs19.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs19.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - fs19 read-only backend tests
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, re, tempfile, shutil
 
--- a/MoinMoin/storage/_tests/test_backends_fs2.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_fs2.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,10 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - FS2Backend
-
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py, os, tempfile, shutil
 
--- a/MoinMoin/storage/_tests/test_backends_hg.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_hg.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2008 MoinMoin:PawelPacana
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MercurialBackend tests
 
     Testcases for MercurialBackend based on stable version
     of Mercurial.
+"""
 
-    @copyright: 2008 MoinMoin:PawelPacana
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from tempfile import mkdtemp, mkstemp, gettempdir
 import shutil
 import os
--- a/MoinMoin/storage/_tests/test_backends_memory.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_memory.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2008 MoinMoin:AlexanderSchremmer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - MemoryBackend
 
     This defines tests for the MemoryBackend.
+"""
 
-    @copyright: 2008 MoinMoin:ChristopherDenter,
-                2008 MoinMoin:JohannesBerg,
-                2008 MoinMoin:AlexanderSchremmer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.storage._tests.test_backends import BackendTest
 from MoinMoin.storage.backends.memory import MemoryBackend, TracingBackend
--- a/MoinMoin/storage/_tests/test_backends_router.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_router.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - RouterBackend
 
     This defines tests for the RouterBackend
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/storage/_tests/test_backends_sqla.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_backends_sqla.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - SQLAlchemyBackend
 
     This defines tests for the SQLAlchemyBackend.
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from StringIO import StringIO
 
--- a/MoinMoin/storage/_tests/test_middleware_acl.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_middleware_acl.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - ACLMiddleWare
 
     This defines tests for the ACLMiddleWare
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter,
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/storage/_tests/test_serialization.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/test_serialization.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - XML (de)serialization
 
     TODO: provide fresh backend per test class (or even per test method?).
     TODO: use xpath for testing (or any other way so sequence of metadata
           keys does not matter)
+"""
 
-    @copyright: 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/storage/_tests/tests_backend_api.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/_tests/tests_backend_api.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,10 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Test - storage API
-
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 import py
 
 from MoinMoin.storage import Backend, Item, StoredRevision, NewRevision
--- a/MoinMoin/storage/backends/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2007 MoinMoin:HeinrichWendel
+# Copyright: 2008 MoinMoin:PawelPacana
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Backends
 
     This package contains code for the backends of the new storage layer.
+"""
 
-    @copyright: 2007 MoinMoin:HeinrichWendel,
-                2008 MoinMoin:PawelPacana,
-                2009 MoinMoin:ChristopherDenter,
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import flaskg
 
--- a/MoinMoin/storage/backends/_flatutils.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/_flatutils.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - helpers for flatfile meta/data stores
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 def split_body(body):
--- a/MoinMoin/storage/backends/_fsutils.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/_fsutils.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - helper for fs based backends
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/storage/backends/acl.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/acl.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,11 @@
+# Copyright: 2003-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2003 Gustavo Niemeyer
+# Copyright: 2005 Oliver Graf
+# Copyright: 2007 Alexander Schremmer
+# Copyright: 2009 Christopher Denter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - ACL Middleware
 
@@ -31,15 +39,8 @@
     be wrapped itself, as is the case when items or revisions are returned.
 
     All wrapped classes must, of course, adhere to the normal storage API.
+"""
 
-    @copyright: 2003-2010 MoinMoin:ThomasWaldmann,
-                2000-2004 Juergen Hermann <jh@web.de>,
-                2003 Gustavo Niemeyer,
-                2005 Oliver Graf,
-                2007 Alexander Schremmer,
-                2009 Christopher Denter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from UserDict import DictMixin
 
--- a/MoinMoin/storage/backends/fileserver.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/fileserver.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - file server backend
 
@@ -6,10 +9,8 @@
 
     TODO: nearly working, but needs more work at other places,
           e.g. in the router backend, to be useful.
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, stat
 from StringIO import StringIO
--- a/MoinMoin/storage/backends/flatfile.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/flatfile.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - flat file backend
 
@@ -14,11 +18,8 @@
 
     The backend _does_ store some revision metadata, namely that which
     used to traditionally be part of the page header.
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg,
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, re, errno
 from cStringIO import StringIO
--- a/MoinMoin/storage/backends/fs.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/fs.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - FS (filesystem) backend
 
     XXX: Does NOT work on win32. some problems are documented below (see XXX),
          some are maybe NOT.
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg,
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, struct, tempfile, random, errno, shutil
 import cPickle as pickle
--- a/MoinMoin/storage/backends/fs19.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/fs19.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Backend for moin 1.9 compatible filesystem data storage.
 
@@ -8,11 +12,8 @@
 
     Note: we do not support emulation of trashbin-like deletion, you have to
           choose a deleted_mode (see below) when creating a FSPageBackend.
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg,
-                2008-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 from StringIO import StringIO
--- a/MoinMoin/storage/backends/fs19_logfile.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/fs19_logfile.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2005-2007 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - LogFile package
 
     This module supports buffered log reads, iterating forward and backward line-by-line, etc.
+"""
 
-    @copyright: 2005-2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/storage/backends/fs2.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/fs2.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008 MoinMoin:JohannesBerg ("fs2" is originally based on "fs" from JB)
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - FS2 backend
 
@@ -6,11 +10,8 @@
     * use uuids for item storage names
     * uses content hash addressing for revision data storage
     * use sqlalchemy/sqlite (not cdb/self-made DBs like fs does)
+"""
 
-    @copyright: 2008 MoinMoin:JohannesBerg ("fs2" is originally based on "fs" from JB),
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, tempfile, errno, shutil
 from uuid import uuid4 as make_uuid
--- a/MoinMoin/storage/backends/hg.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/hg.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2008 MoinMoin:PawelPacana
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MercurialBackend
 
@@ -15,10 +18,8 @@
           graphical history view for hg backend was removed at 2010-09-25,
           because it needed refactoring for flask/jinja2, but was unmaintained.
           If you'ld like to work on it, pull it from repo history.
+"""
 
-    @copyright: 2008 MoinMoin:PawelPacana
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from __future__ import with_statement
 
 import os
--- a/MoinMoin/storage/backends/indexing.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/indexing.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Indexing Mixin Classes
 
@@ -13,10 +16,8 @@
     The wiki item name is contained in the item revision's metadata.
     If you rename an item, this is done by creating a new revision with a different
     (new) name in its revision metadata.
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import time, datetime
--- a/MoinMoin/storage/backends/memory.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/memory.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,8 @@
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2008 MoinMoin:JohannesBerg
+# Copyright: 2008 MoinMoin:AlexanderSchremmer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MemoryBackend + TracingBackend
 
@@ -12,12 +17,8 @@
     backend for any production site that needs persistant storage.
 
     ---
+"""
 
-    @copyright: 2008 MoinMoin:ChristopherDenter,
-                2008 MoinMoin:JohannesBerg,
-                2008 MoinMoin:AlexanderSchremmer
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import StringIO
 from threading import Lock
--- a/MoinMoin/storage/backends/router.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/router.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2008-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - routing backend
 
@@ -8,11 +12,8 @@
     a MercurialBackend and similarly tmp/<youritemnamehere> is for
     temporary items in a MemoryBackend() that are discarded when the
     process terminates.
+"""
 
-    @copyright: 2008-2010 MoinMoin:ThomasWaldmann,
-                2009 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re
 
--- a/MoinMoin/storage/backends/sqla.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/backends/sqla.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2009 MoinMoin:ChristopherDenter
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Backends - SQLAlchemy Backend
 
@@ -59,12 +63,8 @@
           instead.
         * Currently there only is SQLARevision. Make sure that operations that are not allowed (such as modifying
           the data of an already stored revision) raise the appropriate exceptions.
-
+"""
 
-    @copyright: 2009 MoinMoin:ChristopherDenter,
-                2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from threading import Lock
 
--- a/MoinMoin/storage/error.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/error.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2007 MoinMoin:HeinrichWendel
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2009 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin storage errors
+"""
 
-    @copyright: 2007 MoinMoin:HeinrichWendel,
-                2008 MoinMoin:ChristopherDenter,
-                2009 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.i18n import _, L_, N_
 from MoinMoin.error import CompositeError
--- a/MoinMoin/storage/serialization.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/storage/serialization.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - XML serialization support
 
@@ -20,10 +23,8 @@
     c) serialize just some items:
     some_items = [u'FrontPage', u'HelpOnLinking', u'HelpOnMoinWikiSyntax', ]
     serialize(backend, 'some_items.xml', ItemNameList, some_items)
+"""
 
-    @copyright: 2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
--- a/MoinMoin/themes/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/themes/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2003-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2008 MoinMoin:RadomirDopieralski
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Theme Support
+"""
 
-    @copyright: 2003-2010 MoinMoin:ThomasWaldmann,
-                2008 MoinMoin:RadomirDopieralski,
-                2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import urllib
--- a/MoinMoin/themes/_tests/test_navi_bar.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/themes/_tests/test_navi_bar.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Navibar Tests
+"""
 
-    @copyright: 2010 MoinMoin:DiogenesAugusto,
-                2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from flask import current_app as app
 
--- a/MoinMoin/user.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/user.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,11 @@
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2003-2011 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:JohannesBerg
+# Copyright: 2007 MoinMoin:HeinrichWendel
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# Copyright: 2010 MoinMoin:DiogenesAugusto
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - User Accounts
 
@@ -6,15 +14,8 @@
     This module contains functions to access user accounts (list all users, get
     some specific user). User instances are used to access the user profile of
     some specific user (name, password, email, bookmark, trail, settings, ...).
+"""
 
-    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2003-2011 MoinMoin:ThomasWaldmann,
-                2007 MoinMoin:JohannesBerg,
-                2007 MoinMoin:HeinrichWendel,
-                2008 MoinMoin:ChristopherDenter,
-                2010 MoinMoin:DiogenesAugusto
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import time, base64
 import copy
--- a/MoinMoin/util/SubProcess.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/SubProcess.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
+# Copyright: 2009,2010 by Thomas Waldmann (modifications)
+# License: Python license (http://www.python.org/2.4/license)
+
 """
 Enhanced subprocess.Popen subclass, supporting:
     * .communicate() with timeout
 
 Sample usage:
     out, err = Popen(...).communicate(input, timeout=300)
+"""
 
-@copyright: 2003-2005 by Peter Astrand <astrand@lysator.liu.se>,
-            2009,2010 by Thomas Waldmann (modifications)
-@license: Python license (http://www.python.org/2.4/license)
-"""
 
 import os
 import subprocess
--- a/MoinMoin/util/__init__.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/__init__.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2004 Juergen Hermann, Thomas Waldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Utility Functions
     General helper functions that are not directly wiki related.
+"""
 
-    @copyright: 2004 Juergen Hermann, Thomas Waldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import re, random
 
--- a/MoinMoin/util/_tests/test_diff3.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_diff3.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.diff3 Tests
+"""
 
-    @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import diff3
 
--- a/MoinMoin/util/_tests/test_diff_text.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_diff_text.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.diff_text Tests
+"""
 
-    @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util import diff_text
 
--- a/MoinMoin/util/_tests/test_filesys.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_filesys.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.filesys Tests
+"""
 
-    @copyright: 2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 import sys, os, time
 import shutil, tempfile
 
--- a/MoinMoin/util/_tests/test_interwiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_interwiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# Copyright: 2010 MoinMoin:MicheleOrru
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.interwiki Tests
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann,
-                2010 MoinMoin:MicheleOrru
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from __future__ import with_statement
 import py
--- a/MoinMoin/util/_tests/test_iri.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_iri.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright: 2008,2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.util.iri
+"""
 
-@copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/util/_tests/test_lock.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_lock.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2005 by Florian Festi
+# Copyright: 2007 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.module_tested Tests
+"""
 
-    @copyright: 2005 by Florian Festi,
-                2007 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import tempfile, os, time, shutil
 
--- a/MoinMoin/util/_tests/test_mime.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_mime.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.util.mime
+"""
 
-@copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/util/_tests/test_paramparser.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_paramparser.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.paramparser Tests
+"""
 
-    @copyright:2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py
 
--- a/MoinMoin/util/_tests/test_pysupport.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_pysupport.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2004 Oliver Graf <ograf@bitart.de>
+# Copyright: 2007 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util.pysupport Tests
+"""
 
-    @copyright: 2004 Oliver Graf <ograf@bitart.de>,
-                2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, errno
 
--- a/MoinMoin/util/_tests/test_registry.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_registry.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008,2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.util.registry
+"""
 
-@copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/util/_tests/test_tree.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_tree.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tests for MoinMoin.util.tree
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import py.test
 
--- a/MoinMoin/util/_tests/test_util.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_util.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2007 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.util Tests
+"""
 
-    @copyright: 2007 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin import util
 
--- a/MoinMoin/util/_tests/test_version.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/_tests/test_version.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 by MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - MoinMoin.version Tests
+"""
 
-    @copyright: 2010 by MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.util.version import Version
 
--- a/MoinMoin/util/chartypes_create.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/chartypes_create.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2004 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     Build MoinMoin/util/chartypes.py with
     UCS-2 character types (upper/lower/digits/spaces).
+"""
 
-    @copyright: 2004 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 uppercase = []
 lowercase = []
--- a/MoinMoin/util/clock.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/clock.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2001-2003 Juergen Hermann <jh@web.de>
+# Copyright: 2003-2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Clock
+"""
 
-    @copyright: 2001-2003 Juergen Hermann <jh@web.de>,
-                2003-2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import time
 from MoinMoin import log
--- a/MoinMoin/util/diff3.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/diff3.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2002 Florian Festi
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - diff3 algorithm
+"""
 
-    @copyright: 2002 Florian Festi
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 default_markers = ('<<<<<<<<<<<<<<<<<<<<<<<<<\n',
                    '=========================\n',
--- a/MoinMoin/util/diff_html.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/diff_html.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2002 Juergen Hermann <jh@web.de>
+# Copyright: 2002 Scott Moonen <smoonen@andstuff.org>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Side by side diffs
+"""
 
-    @copyright: 2002 Juergen Hermann <jh@web.de>,
-                2002 Scott Moonen <smoonen@andstuff.org>
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import difflib
 
--- a/MoinMoin/util/diff_text.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/diff_text.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - simple text diff (uses difflib)
+"""
 
-    @copyright: 2006 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import difflib
 
--- a/MoinMoin/util/edit_lock.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/edit_lock.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2006-2011 The MoinMoin development team
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Edit Locking
+"""
 
-    @copyright: 2006-2011 The MoinMoin development team
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 EDIT_LOCK_TIMESTAMP = "edit_lock_timestamp"
 EDIT_LOCK_ADDR = "edit_lock_addr"
--- a/MoinMoin/util/filesys.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/filesys.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2002 Juergen Hermann <jh@web.de>
+# Copyright: 2006-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - File System Utilities
+"""
 
-    @copyright: 2002 Juergen Hermann <jh@web.de>,
-                2006-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import sys, os, shutil, time, errno
 from stat import S_ISDIR, ST_MODE, S_IMODE
--- a/MoinMoin/util/forms.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/forms.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 Thomas Waldmann, Jason Kirtland, Scott Wilson
+# License: see flatland license
+
 """
     MoinMoin - form helpers for flatland / jinja2
+"""
 
-    @copyright: 2010 Thomas Waldmann, Jason Kirtland, Scott Wilson
-    @license: see flatland license
-"""
 
 from jinja2 import Markup
 
--- a/MoinMoin/util/interwiki.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/interwiki.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# Copyright: 2010 MoinMoin:MicheleOrru
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - interwiki support code
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann,
-                2010 MoinMoin:MicheleOrru
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 from __future__ import with_statement
 
 from werkzeug import url_quote
--- a/MoinMoin/util/iri.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/iri.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,11 +1,12 @@
+# Copyright: 2008,2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Generic? IRI implementation
 
 Implements the generic IRI form as defined in RFC 3987.
+"""
 
-@copyright: 2008,2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import codecs
 import re
--- a/MoinMoin/util/kvstore.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/kvstore.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
+# Copyright: 2010 by Thomas Waldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 kvstore - a flexible key/value store using sqlalchemy
+"""
 
-@copyright: 2010 by Thomas Waldmann
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from UserDict import DictMixin
 
--- a/MoinMoin/util/lock.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/lock.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: 2005 Florian Festi, Nir Soffer
+# Copyright: 2008 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - locking functions
+"""
 
-    @copyright: 2005 Florian Festi, Nir Soffer,
-                2008 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, sys, tempfile, time, errno
 
--- a/MoinMoin/util/mime.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/mime.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2009 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - MIME helpers
+"""
 
-@copyright: 2009 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 class Type(object):
--- a/MoinMoin/util/monkeypatch.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/monkeypatch.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: the individual patches have same license as the code they are patching
+
 """
 This module contains some monkeypatching for 3rd party code we use.
 
 We hope that any 3rd party might find this code useful and will adopt it,
 so we don't need to patch it any more. If you adopt some code from here,
 please notify us, so we can remove it from here.
+"""
 
-@copyright: 2010 MoinMoin:ThomasWaldmann
-@license: the individual patches have same license as the code they are patching
-"""
 
 # werkzeug patching ----------------------------------------------------------
 
--- a/MoinMoin/util/paramparser.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/paramparser.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - parameter parsing and invoking of extension functions
+"""
 
-    @copyright: 2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from MoinMoin.i18n import _, L_, N_
 
--- a/MoinMoin/util/plugins.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/plugins.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2004 by Florian Festi
+# Copyright: 2006 by Mikko Virkkil
+# Copyright: 2005-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:ReimarBauer
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - plugin loader
+"""
 
-    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2004 by Florian Festi,
-                2006 by Mikko Virkkil,
-                2005-2010 MoinMoin:ThomasWaldmann,
-                2007 MoinMoin:ReimarBauer,
-                2008 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, sys
 import imp
--- a/MoinMoin/util/profile.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/profile.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,6 @@
+# Copyright: 2004 Nir Soffer
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """ profile - moin profiling utilities
 
 This module provides profilers used to profile the memory usage of a
@@ -32,10 +35,8 @@
    real world memory usage of the application.
 
 Based on code by Oliver Graf
+"""
 
-@copyright: 2004 Nir Soffer
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os, time, gc
 
--- a/MoinMoin/util/pycdb.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/pycdb.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,10 +1,11 @@
+# Copyright: Yusuke Shinyama (author)
+# Copyright: Johannes Berg (coding style fixes and tcdb removal)
+# License: Public Domain
+
 """
 pycdb.py - Python implementation of cdb
+"""
 
-@copyright: Yusuke Shinyama (author),
-            Johannes Berg (coding style fixes and tcdb removal)
-@license: Public Domain
-"""
 
 import os
 from struct import pack, unpack
--- a/MoinMoin/util/pysupport.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/pysupport.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2002 Juergen Hermann <jh@web.de>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Supporting function for Python magic
+"""
 
-    @copyright: 2002 Juergen Hermann <jh@web.de>
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 #############################################################################
 ### Module import / Plugins
--- a/MoinMoin/util/python_compatibility.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/python_compatibility.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,12 +1,13 @@
+# Copyright: 2007 Heinrich Wendel <heinrich.wendel@gmail.com>
+# Copyright: 2009-2010 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Support Package
 
     Stuff for compatibility with older Python versions
+"""
 
-    @copyright: 2007 Heinrich Wendel <heinrich.wendel@gmail.com>,
-                2009-2010 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 min_req_exc = Exception("Minimum requirement for MoinMoin is Python 2.6.")
 
--- a/MoinMoin/util/registry.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/registry.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2008-2010 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Module registry
 
 Every module registers a factory for itself at the registry with a given
 priority.  During the lookup each factory is called with the given arguments and
 can return a callable to consider itself as a match.
+"""
 
-@copyright: 2008-2010 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 class RegistryBase(object):
--- a/MoinMoin/util/send_file.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/send_file.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,3 +1,7 @@
+# Copyright: 2010 by Armin Ronacher (initial implementation)
+# Copyright: 2011 by MoinMoin:ThomasWaldmann (modifications)
+# License: BSD (see license of flask)
+
 """
 A better send_file
 ------------------
@@ -12,11 +16,8 @@
 As we forked send_file, we later modified it (without trying to stay
 compatible), because we can easily adapt anyway and the code can be much
 simpler without compatibility code.
+"""
 
-@copyright: 2010 by Armin Ronacher (initial implementation),
-            2011 by MoinMoin:ThomasWaldmann (modifications)
-@license: BSD (see license of flask)
-"""
 
 import os
 import mimetypes
--- a/MoinMoin/util/thread_monitor.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/thread_monitor.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,13 +1,14 @@
+# Copyright: 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     Thread monitor - Check the state of all threads.
 
     Just call activate_hook() as early as possible in program execution.
     Then you can trigger the output of tracebacks of all threads
     by calling trigger_dump().
+"""
 
-    @copyright: 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 
 __all__ = "activate_hook trigger_dump dump_regularly".split()
--- a/MoinMoin/util/tree.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/tree.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2008 MoinMoin:BastianBlank
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
 MoinMoin - Tree name and element generator
+"""
 
-@copyright: 2008 MoinMoin:BastianBlank
-@license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 from emeraldtree import ElementTree as ET
 
--- a/MoinMoin/util/version.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/util/version.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,9 +1,10 @@
+# Copyright: 2011 MoinMoin:ThomasWaldmann
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - dealing with version numbers
+"""
 
-    @copyright: 2011 MoinMoin:ThomasWaldmann
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 # see MoinMoin/_tests/test_version.py for examples how to use this:
 
--- a/MoinMoin/wikiutil.py	Sun Feb 27 16:58:22 2011 +0100
+++ b/MoinMoin/wikiutil.py	Sun Feb 27 18:11:54 2011 +0100
@@ -1,14 +1,15 @@
+# Copyright: 2000-2004 Juergen Hermann <jh@web.de>
+# Copyright: 2004 by Florian Festi
+# Copyright: 2006 by Mikko Virkkil
+# Copyright: 2005-2010 MoinMoin:ThomasWaldmann
+# Copyright: 2007 MoinMoin:ReimarBauer
+# Copyright: 2008 MoinMoin:ChristopherDenter
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
 """
     MoinMoin - Wiki Utility Functions
+"""
 
-    @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2004 by Florian Festi,
-                2006 by Mikko Virkkil,
-                2005-2010 MoinMoin:ThomasWaldmann,
-                2007 MoinMoin:ReimarBauer,
-                2008 MoinMoin:ChristopherDenter
-    @license: GNU GPL v2 (or any later version), see LICENSE.txt for details.
-"""
 
 import os
 import re