update headers

- update copyright years
- replace "DDPortfolio service" in file headers with "Debian Member Portfolio
  Service"

ddportfolioservice/controllers/ddportfolio.py

@@ -1,24 +1,23 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service DdportfolioController
+# Debian Member Portfolio Service DdportfolioController
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of DDPortfolio service.
+# This file is part of Debian Member Portfolio Service.
 #
-# DDPortfolio service is free software: you can redistribute it and/or
+# Debian Member Portfolio Service is free software: you can redistribute it
-# modify it under the terms of the GNU Affero General Public License
+# and/or modify it under the terms of the GNU Affero General Public License as
-# as published by the Free Software Foundation, either version 3 of
+# published by the Free Software Foundation, either version 3 of the License,
-# the License, or (at your option) any later version.
+# or (at your option) any later version.
 #
-# DDPortfolio service is distributed in the hope that it will be
+# Debian Member Portfolio Service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-# Affero General Public License for more details.
+# General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public
+# You should have received a copy of the GNU Affero General Public License
-# License along with this program.  If not, see
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# <http://www.gnu.org/licenses/>.
 #
 import logging
 import simplejson
@@ -46,7 +45,7 @@ class DdportfolioController(BaseController):
             'ddpo': N_("Debian Member's Package Overview"),
             'alladdresses': N_("""Debian Member's Package Overview
 ... showing all email addresses"""),
-            },
+        },
         'bugs': {
             'label': N_('Bugs'),
             'received': N_('''bugs received
@@ -60,12 +59,12 @@ developer name on all bug logs)'),
             'wnpp': N_('<a href="http://wiki.debian.org/WNPP">WNPP</a>'),
             'correspondent': N_('correspondent for bugs'),
             'graph': N_('one year open bug history graph'),
-            },
+        },
         'build': {
             'label': N_('Build'),
             'buildd': N_('buildd.d.o'),
             'igloo': N_('igloo'),
-            },
+        },
         'qa': {
             'label': N_('Quality Assurance'),
             'dmd': N_('maintainer dashboard'),
@@ -75,19 +74,19 @@ developer name on all bug logs)'),
             'piuparts': N_('piuparts'),
             'patchtracker': N_('Debian patch tracking system'),
             'duck': N_('Debian Url ChecKer'),
-            },
+        },
         'lists': {
             'label': N_('Mailing Lists'),
             'dolists': N_('lists.d.o'),
             'adolists': N_('lists.a.d.o'),
             'gmane': N_('gmane'),
-            },
+        },
         'files': {
             'label': N_('Files'),
             'people': N_('people.d.o'),
             'oldpeople': N_('oldpeople'),
             'alioth': N_('Alioth'),
-            },
+        },
         'membership': {
             'label': N_('Membership'),
             'nm': N_('NM'),
@@ -97,7 +96,7 @@ developer name on all bug logs)'),
             'alioth': N_('Alioth'),
             'wiki': N_('Wiki'),
             'forum': N_('Forum'),
-            },
+        },
         'miscellaneous': {
             'label': N_('Miscellaneous'),
             'debtags': N_('debtags'),
@@ -110,19 +109,19 @@ developer name on all bug logs)'),
             'gpgweb': N_('GPG public key via HTTP'),
             'nm': N_('NM, AM participation'),
             'contrib': N_('Contribution information'),
-            },
+        },
         'ssh': {
             'label': N_('Information reachable via ssh (for Debian Members)'),
             'owndndoms': N_('owned debian.net domains'),
             'miainfo': N_('<a href="http://wiki.debian.org/qa.debian.org/'
                           'MIATeam">MIA</a> database information'),
             'groupinfo': N_('Group membership information'),
-            },
+        },
         'ubuntu': {
             'label': N_('Ubuntu'),
             'ubuntudiff': N_('Available patches from Ubuntu'),
-            },
+        },
-        }
+    }
 
     def _get_label(self, section, url=None):
         if section in self._LABELS:
@@ -187,9 +186,8 @@ developer name on all bug logs)'),
         if form_result['mode'] == 'json':
             response.headers['Content-Type'] = 'text/javascript'
             return simplejson.dumps(
-                dict([("%s.%s" % \
+                dict([("%s.%s" % (entry[1], entry[2].name), entry[3])
-                           (entry[1], entry[2].name), entry[3]) \
+                      for entry in data if entry[0] == 'url']))
-                          for entry in data if entry[0] == 'url']))
         for entry in data:
             if entry[0] in ('url', 'error'):
                 entry.append(_(self._get_label(entry[1], entry[2].name)))

ddportfolioservice/model/ddportfolio.ini

@@ -1,22 +1,22 @@
 #
-# Configuration for Debian Member Portfolio service
+# Configuration for Debian Member Portfolio Service
 #
 # Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of the Debian Member Portfolio service.
+# This file is part of the Debian Member Portfolio Service.
 #
-# Debian Member Portfolio service is free software: you can redistribute it
+# Debian Member Portfolio Service is free software: you can redistribute it
 # and/or modify it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the License,
 # or (at your option) any later version.
 #
-# Debian Member Portfolio service is distributed in the hope that it will be# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# Debian Member Portfolio Service is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
 # General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public
+# You should have received a copy of the GNU Affero General Public License
-# License along with this program.  If not, see
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# <http://www.gnu.org/licenses/>.
 #
 [DEFAULT]
 gnupghome=~/debian/gnupghome

ddportfolioservice/model/form.py

@@ -1,24 +1,23 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service form handling model
+# Debian Member Portfolio Service form handling model
-# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of DDPortfolio service.
+# This file is part of Debian Member Portfolio Service.
 #
-# DDPortfolio service is free software: you can redistribute it and/or
+# Debian Member Portfolio Service is free software: you can redistribute it
-# modify it under the terms of the GNU Affero General Public License
+# and/or modify it under the terms of the GNU Affero General Public License as
-# as published by the Free Software Foundation, either version 3 of
+# published by the Free Software Foundation, either version 3 of the License,
-# the License, or (at your option) any later version.
+# or (at your option) any later version.
 #
-# DDPortfolio service is distributed in the hope that it will be
+# Debian Member Portfolio Service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-# Affero General Public License for more details.
+# General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public
+# You should have received a copy of the GNU Affero General Public License
-# License along with this program.  If not, see
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# <http://www.gnu.org/licenses/>.
 #
 import formencode
 

ddportfolioservice/model/keyfinder.py

@@ -1,24 +1,23 @@
 # -*- python -*-
 # -*- coding: utf-8 -*-
 #
-# DDPortfolio service key finder module
+# Debian Member Portfolio Service key finder module
-# Copyright (c) 2009, 2010, 2011, 2012 Jan Dittberner <jan@dittberner.info>
+# Copyright (c) 2009-2014 Jan Dittberner <jan@dittberner.info>
 #
-# This file is part of DDPortfolio service.
+# This file is part of Debian Member Portfolio Service.
 #
-# DDPortfolio service is free software: you can redistribute it and/or
+# Debian Member Portfolio Service is free software: you can redistribute it
-# modify it under the terms of the GNU Affero General Public License
+# and/or modify it under the terms of the GNU Affero General Public License as
-# as published by the Free Software Foundation, either version 3 of
+# published by the Free Software Foundation, either version 3 of the License,
-# the License, or (at your option) any later version.
+# or (at your option) any later version.
 #
-# DDPortfolio service is distributed in the hope that it will be
+# Debian Member Portfolio Service is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-# Affero General Public License for more details.
+# General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
+# License along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# <http://www.gnu.org/licenses/>.
 #
 """
 This module provides tools for finding PGP key information from a
@@ -86,6 +85,7 @@ def getLoginByFingerprint(fpr):
     """
     return _get_cached('login:fpr:%s' % fpr)
 
+
 def _dump_cache():
     cache = _get_keyring_cache()
     fprs = []
@@ -94,16 +94,16 @@ def _dump_cache():
             fpr = key.replace('email:fpr:', '')
             if not fpr in fprs:
                 fprs.append(fpr)
-        
+
     for fpr in fprs:
         login = getLoginByFingerprint(fpr)
         email = _get_cached('email:fpr:%s' % fpr)
         name = _get_cached('name:fpr:%s' % fpr)
-        
+
         print fpr, login, ':'
         print '   ', name, email
-        
+
-        
+
 if __name__ == '__main__':
     logging.basicConfig(stream=sys.stderr, level=logging.WARNING)
     _dump_cache()

ddportfolioservice/templates/showurls.mako

@@ -2,23 +2,22 @@
 <%inherit file="base.mako" />\
 <%doc>
 Template for the url output page.
-Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
+Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
 
-This file is part of DDPortfolio service.
+This file is part of Debian Member Portfolio Service.
 
-DDPortfolio service is free software: you can redistribute it and/or
+Debian Member Portfolio Service is free software: you can redistribute it
-modify it under the terms of the GNU Affero General Public License as
+and/or modify it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
+published by the Free Software Foundation, either version 3 of the License, or
-License, or (at your option) any later version.
+(at your option) any later version.
 
-DDPortfolio service is distributed in the hope that it will be useful,
+Debian Member Portfolio Service is distributed in the hope that it will be
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-Affero General Public License for more details.
+General Public License for more details.
 
-You should have received a copy of the GNU Affero General Public
+You should have received a copy of the GNU Affero General Public License along
-License along with this program.  If not, see
+with this program.  If not, see <http://www.gnu.org/licenses/>.
-<http://www.gnu.org/licenses/>.
 </%doc>\
 <%def name="titleaddon()">
  - ${_('Your personal links')}