From e203f9a20afdf1d215bd0c8051c4941f9b90f1ef Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 20 Apr 2015 20:38:20 +0200 Subject: [PATCH 01/22] remove Wheezy requirements file wheezyreq.pip --- wheezyreq.pip | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 wheezyreq.pip diff --git a/wheezyreq.pip b/wheezyreq.pip deleted file mode 100644 index f177096..0000000 --- a/wheezyreq.pip +++ /dev/null @@ -1,20 +0,0 @@ -Babel==0.9.6 -Beaker==1.6.3 -FormEncode==1.2.4 -Mako==0.7.0 -MarkupSafe==0.15 -Paste==1.7.5.1 -PasteDeploy==1.5.0 -PasteScript==1.7.5 -Pygments==1.5 -Pylons==1.0 -Routes==1.13 -Tempita==0.5.1 -WebError==0.10.3 -WebHelpers==1.3 -WebOb==1.1.1 -WebTest==1.3.4 -argparse==1.2.1 -nose==1.1.2 -simplejson==2.5.2 -wsgiref==0.1.2 From c3ead7e7295903e87a85415b636c93738355c434 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 20 Apr 2015 20:46:27 +0200 Subject: [PATCH 02/22] comment Pylons requirements, add Flask requirements --- jessiereq.pip | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/jessiereq.pip b/jessiereq.pip index cb7127d..a12f896 100644 --- a/jessiereq.pip +++ b/jessiereq.pip @@ -1,18 +1,23 @@ -Babel==1.3 -Beaker==1.6.4 -FormEncode==1.2.6 -Mako==1.0.0 +Flask==0.10.1 +Jinja2==2.7.3 MarkupSafe==0.23 -Paste==1.7.5.1 -PasteDeploy==1.5.2 -PasteScript==1.7.5 -Pygments==2.0.1 -Pylons==1.0.1 -Routes==2.0 -Tempita==0.5.2 -WebError==0.10.3 -WebHelpers==1.3 -WebOb==1.4 -WebTest==2.0.16 -nose==1.3.4 -simplejson==3.6.5 +Werkzeug==0.9.6 +itsdangerous==0.24 +#Babel==1.3 +#Beaker==1.6.4 +#FormEncode==1.2.6 +#Mako==1.0.0 +#MarkupSafe==0.23 +#Paste==1.7.5.1 +#PasteDeploy==1.5.2 +#PasteScript==1.7.5 +#Pygments==2.0.1 +#Pylons==1.0.1 +#Routes==2.0 +#Tempita==0.5.2 +#WebError==0.10.3 +#WebHelpers==1.3 +#WebOb==1.4 +#WebTest==2.0.16 +#nose==1.3.4 +#simplejson==3.6.5 From 1e219ee99248f7d40a5974de29543e3151cdc089 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 20 Apr 2015 20:50:07 +0200 Subject: [PATCH 03/22] remove Pylons references from setup.py --- setup.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 0f44648..cfe9852 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ setup( author_email='jan@dittberner.info', url='http://debian-stuff.dittberner.info/debianmemberportfolio', license='AGPL-3.0+', - install_requires=["Pylons>=1.0", 'babel>=0.9.6'], + install_requires=["Flask>=0.10.1", 'babel>=0.9.6'], packages=find_packages(exclude=['ez_setup']), include_package_data=True, test_suite='nose.collector', @@ -57,11 +57,4 @@ setup( ('templates/**.mako', 'mako', None), ('public/**', 'ignore', None)]}, zip_safe=False, - entry_points=""" - [paste.app_factory] - main = debianmemberportfolio.config.middleware:make_app - - [paste.app_install] - main = pylons.util:PylonsInstaller - """, ) From 7c21e449d48b872d4ae2b8f1dd4af40d52f21e82 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:25:31 +0100 Subject: [PATCH 04/22] Move Pylons implementation to attic --- {debianmemberportfolio => attic}/config/__init__.py | 0 {debianmemberportfolio => attic}/config/deployment.ini_tmpl | 0 {debianmemberportfolio => attic}/config/environment.py | 0 {debianmemberportfolio => attic}/config/middleware.py | 0 {debianmemberportfolio => attic}/config/routing.py | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {debianmemberportfolio => attic}/config/__init__.py (100%) rename {debianmemberportfolio => attic}/config/deployment.ini_tmpl (100%) rename {debianmemberportfolio => attic}/config/environment.py (100%) rename {debianmemberportfolio => attic}/config/middleware.py (100%) rename {debianmemberportfolio => attic}/config/routing.py (100%) diff --git a/debianmemberportfolio/config/__init__.py b/attic/config/__init__.py similarity index 100% rename from debianmemberportfolio/config/__init__.py rename to attic/config/__init__.py diff --git a/debianmemberportfolio/config/deployment.ini_tmpl b/attic/config/deployment.ini_tmpl similarity index 100% rename from debianmemberportfolio/config/deployment.ini_tmpl rename to attic/config/deployment.ini_tmpl diff --git a/debianmemberportfolio/config/environment.py b/attic/config/environment.py similarity index 100% rename from debianmemberportfolio/config/environment.py rename to attic/config/environment.py diff --git a/debianmemberportfolio/config/middleware.py b/attic/config/middleware.py similarity index 100% rename from debianmemberportfolio/config/middleware.py rename to attic/config/middleware.py diff --git a/debianmemberportfolio/config/routing.py b/attic/config/routing.py similarity index 100% rename from debianmemberportfolio/config/routing.py rename to attic/config/routing.py From 30a35914c3d6a84eab96c83f70da27f6dbe17ab2 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:27:02 +0100 Subject: [PATCH 05/22] Move translation files This commit moves the Pylons translations files (debianmemberportfolio/i18n) to debianmemberportfolio/translations because this is where Babel/Flask expect them. --- .../de/LC_MESSAGES/messages.po} | 0 .../fr/LC_MESSAGES/messages.po} | 0 .../id/LC_MESSAGES/messages.po} | 0 .../pt_BR/LC_MESSAGES/messages.po} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename debianmemberportfolio/{i18n/de/LC_MESSAGES/debianmemberportfolio.po => translations/de/LC_MESSAGES/messages.po} (100%) rename debianmemberportfolio/{i18n/fr/LC_MESSAGES/debianmemberportfolio.po => translations/fr/LC_MESSAGES/messages.po} (100%) rename debianmemberportfolio/{i18n/id/LC_MESSAGES/debianmemberportfolio.po => translations/id/LC_MESSAGES/messages.po} (100%) rename debianmemberportfolio/{i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.po => translations/pt_BR/LC_MESSAGES/messages.po} (100%) diff --git a/debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.po b/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po similarity index 100% rename from debianmemberportfolio/i18n/de/LC_MESSAGES/debianmemberportfolio.po rename to debianmemberportfolio/translations/de/LC_MESSAGES/messages.po diff --git a/debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.po b/debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po similarity index 100% rename from debianmemberportfolio/i18n/fr/LC_MESSAGES/debianmemberportfolio.po rename to debianmemberportfolio/translations/fr/LC_MESSAGES/messages.po diff --git a/debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.po b/debianmemberportfolio/translations/id/LC_MESSAGES/messages.po similarity index 100% rename from debianmemberportfolio/i18n/id/LC_MESSAGES/debianmemberportfolio.po rename to debianmemberportfolio/translations/id/LC_MESSAGES/messages.po diff --git a/debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.po b/debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po similarity index 100% rename from debianmemberportfolio/i18n/pt_BR/LC_MESSAGES/debianmemberportfolio.po rename to debianmemberportfolio/translations/pt_BR/LC_MESSAGES/messages.po From cb821caf2416beea5d7018ea4a26f4060a3eed5f Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:28:44 +0100 Subject: [PATCH 06/22] Add Babel configuration --- babel.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 babel.cfg diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 0000000..f0234b3 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,3 @@ +[python: **.py] +[jinja2: **/templates/**.html] +extensions=jinja2.ext.autoescape,jinja2.ext.with_ From c783f96166d1aba8b99876811b6121e2db56f4b4 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:29:16 +0100 Subject: [PATCH 07/22] Move static assets Move the static assets from debianmemberportfolio/public to debianmemberportfolio/static where they are expected by Flask. --- debianmemberportfolio/{public => static}/.gitignore | 0 .../{public => static}/images/agplv3-88x31.png | Bin .../{public => static}/images/openlogo-100.jpg | Bin debianmemberportfolio/{public => static}/robots.txt | 0 .../{public => static}/stylesheets/style.css | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename debianmemberportfolio/{public => static}/.gitignore (100%) rename debianmemberportfolio/{public => static}/images/agplv3-88x31.png (100%) rename debianmemberportfolio/{public => static}/images/openlogo-100.jpg (100%) rename debianmemberportfolio/{public => static}/robots.txt (100%) rename debianmemberportfolio/{public => static}/stylesheets/style.css (100%) diff --git a/debianmemberportfolio/public/.gitignore b/debianmemberportfolio/static/.gitignore similarity index 100% rename from debianmemberportfolio/public/.gitignore rename to debianmemberportfolio/static/.gitignore diff --git a/debianmemberportfolio/public/images/agplv3-88x31.png b/debianmemberportfolio/static/images/agplv3-88x31.png similarity index 100% rename from debianmemberportfolio/public/images/agplv3-88x31.png rename to debianmemberportfolio/static/images/agplv3-88x31.png diff --git a/debianmemberportfolio/public/images/openlogo-100.jpg b/debianmemberportfolio/static/images/openlogo-100.jpg similarity index 100% rename from debianmemberportfolio/public/images/openlogo-100.jpg rename to debianmemberportfolio/static/images/openlogo-100.jpg diff --git a/debianmemberportfolio/public/robots.txt b/debianmemberportfolio/static/robots.txt similarity index 100% rename from debianmemberportfolio/public/robots.txt rename to debianmemberportfolio/static/robots.txt diff --git a/debianmemberportfolio/public/stylesheets/style.css b/debianmemberportfolio/static/stylesheets/style.css similarity index 100% rename from debianmemberportfolio/public/stylesheets/style.css rename to debianmemberportfolio/static/stylesheets/style.css From 7c60ac59a6fb5b5348c9aec3db2b14bfd97fd808 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:30:28 +0100 Subject: [PATCH 08/22] Add Flask requirements --- jessiereq.pip | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jessiereq.pip b/jessiereq.pip index a12f896..86dc4d0 100644 --- a/jessiereq.pip +++ b/jessiereq.pip @@ -3,7 +3,12 @@ Jinja2==2.7.3 MarkupSafe==0.23 Werkzeug==0.9.6 itsdangerous==0.24 -#Babel==1.3 +Babel==1.3 +pytz==2012c +Flask-Babel==0.9 +speaklater==1.3 +Flask-WTF==0.10.2 +WTForms==2.0.1 #Beaker==1.6.4 #FormEncode==1.2.6 #Mako==1.0.0 From f63939cb03603bd3ab89f120c650d3ccadf4c543 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:31:14 +0100 Subject: [PATCH 09/22] Add initial Flask implementation --- config.py | 12 ++ debianmemberportfolio/__init__.py | 11 +- debianmemberportfolio/forms.py | 35 ++++++ debianmemberportfolio/templates/base.html | 48 +++++++ debianmemberportfolio/templates/showform.html | 40 ++++++ .../templates/showformscript.js | 119 ++++++++++++++++++ debianmemberportfolio/views.py | 42 +++++++ run.py | 6 + 8 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 config.py create mode 100644 debianmemberportfolio/forms.py create mode 100644 debianmemberportfolio/templates/base.html create mode 100644 debianmemberportfolio/templates/showform.html create mode 100644 debianmemberportfolio/templates/showformscript.js create mode 100644 debianmemberportfolio/views.py create mode 100755 run.py diff --git a/config.py b/config.py new file mode 100644 index 0000000..4345151 --- /dev/null +++ b/config.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- + +WTF_CSRF_ENABLED = False + +# available languages +LANGUAGES = { + 'en': 'English', + 'de': 'Deutsch', + 'fr': 'Français', + 'id': 'Bahasa Indonesia', + 'pt_BR': 'Portuguese (Brazil)' +} diff --git a/debianmemberportfolio/__init__.py b/debianmemberportfolio/__init__.py index d500ba2..56f6669 100644 --- a/debianmemberportfolio/__init__.py +++ b/debianmemberportfolio/__init__.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service package # -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -20,3 +20,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # + +from flask import Flask +from flask.ext.babel import Babel + +app = Flask(__name__) +babel = Babel(app) +app.config.from_object('config') + +from debianmemberportfolio import views diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py new file mode 100644 index 0000000..9f988a5 --- /dev/null +++ b/debianmemberportfolio/forms.py @@ -0,0 +1,35 @@ +from __future__ import unicode_literals + +from flask.ext.wtf import Form +from wtforms import IntegerField, StringField +from wtforms.validators import ( + AnyOf, DataRequired, Email, Length, Optional, Regexp +) + + +class FingerPrint(Regexp): + def __init__(self, **kwargs): + super(FingerPrint, self).__init__(r'^[a-fA-F0-9]*$', **kwargs) + + +class PlainText(Regexp): + def __init__(self, **kwargs): + super(PlainText, self).__init__(r'^[a-zA-Z\-0-9]*$') + + +class DeveloperData(Form): + email = StringField('email', validators=[DataRequired(), Email()]) + name = StringField('name', validators=[DataRequired()]) + gpgfp = StringField('gpgfp', validators=[ + FingerPrint(), + Length(min=32, max=40) + ]) + username = StringField('username', validators=[PlainText()]) + nonddemail = StringField('nonddemail', validators=[Email()]) + aliothusername = StringField('aliothusername', validators=[PlainText()]) + mode = StringField( + 'mode', default='html',validators=[AnyOf(['json', 'html'])] + ) + forumsid = IntegerField('forumsid', default=None, validators=[Optional()]) + wikihomepage = StringField('wikihomepage', default=None, validators=[ + Optional()]) diff --git a/debianmemberportfolio/templates/base.html b/debianmemberportfolio/templates/base.html new file mode 100644 index 0000000..3d5b139 --- /dev/null +++ b/debianmemberportfolio/templates/base.html @@ -0,0 +1,48 @@ + +{# vim: ft=jinja +Base template for XHTML templates. +Copyright © 2009-2015 Jan Dittberner + +This file is part of the Debian Member Portfolio service. + +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 +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 License along +with this program. If not, see . +#} + + + {% block title %}{{ _('Debian Member Portfolio Service') }}{% endblock %} + + {% block extrahead %}{% endblock %} + + + +
+ {% block body %}{% endblock %} +
+ + + + + diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html new file mode 100644 index 0000000..fac47d8 --- /dev/null +++ b/debianmemberportfolio/templates/showform.html @@ -0,0 +1,40 @@ +{% extends "base.html" %} +{# +Template for the data input form. + +Copyright © 2009-2015 Jan Dittberner + +This file is part of the Debian Member Portfolio service. + +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 +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 License along +with this program. If not, see . +#} +{% block title %}{{ super()}} - {{ _('Enter your personal information') }}{% endblock %} +{% block extrahead %}{{ super() }} + +{% endblock %} +{% block body %}{{ super() }} +
+
+ {{ _('Debian Member Portfolio') }} +
+
+ {{ form.email }}
+
+
+
+{% endblock %} diff --git a/debianmemberportfolio/templates/showformscript.js b/debianmemberportfolio/templates/showformscript.js new file mode 100644 index 0000000..10d54cd --- /dev/null +++ b/debianmemberportfolio/templates/showformscript.js @@ -0,0 +1,119 @@ +{# vim: ft=jinja +Helper JavaScript for the data input form. +Copyright © 2009, 2010, 2015 Jan Dittberner + +This file is part of the Debian Member Portfolio service. + +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 +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 License along +with this program. If not, see . +#} +var defaulthiddendivs = new Array( + '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', + '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); +var maskedfielddivs = new Array( + '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', + '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); +var allfielddivs = new Array( + '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', + '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); + +function updateFields(data, textStatus) { + if (data.type == 2) { // DD + $('#name').attr('value', data.name).attr('readonly', 'readonly'); + $('#gpgfp').attr('value', data.gpgfp); + $('#username').attr('value', data.username).attr( + 'readonly', 'readonly'); + $('#nonddemail').attr('value', data.email).focus(); + $('#aliothusername').attr('value', data.username); + $('#wikihomepage').attr('value', data.wikihomepage); + + $('#namefield').show(); + $('#gpgfpfield').show(); + $('#usernamefield').show(); + $('#nonddemailfield').show(); + $('#aliothusernamefield').show(); + $('#wikihomepagefield').show(); + $('#forumsidfield').show(); + + $('#nonddemail').focus().select(); + } else if (data.type == 1) { // DM + $('#name').attr('value', data.name).attr('readonly', 'readonly'); + $('#gpgfp').attr('value', data.gpgfp); + $('#username').attr('value', ''); + $('#nonddemail').attr('value', data.email).focus(); + $('#wikihomepage').attr('value', data.wikihomepage); + + $('#namefield').show(); + $('#gpgfpfield').show(); + $('#usernamefield').hide(); + $('#nonddemailfield').hide(); + $('#aliothusernamefield').show(); + $('#wikihomepagefield').show(); + $('#forumsidfield').show(); + + $('#aliothusername').focus().select(); + } else { + $('#nonddemail').attr('value', data.email); + $('#name').removeAttr('readonly'); + $('#username').removeAttr('readonly').attr('value', ''); + $('#gpgfp').attr('value', ''); + + $('#usernamefield').hide(); + $('#gpgfpfield').hide(); + $('#nonddemailfield').hide(); + $('#namefield').show(); + $('#aliothusernamefield').show(); + $('#wikihomepagefield').show(); + $('#forumsidfield').show(); + + $('#name').focus().select(); + } +} + +function onChangeShowAll(event) { + if ($('#showall').attr('checked')) { + for (var fielddiv in allfielddivs) { + $(allfielddivs[fielddiv]).show(); + } + } else { + for (var fielddiv in maskedfielddivs) { + $(maskedfielddivs[fielddiv]).hide(); + } + } +} + +function onBlurEmail() { + if ($.trim($('#email').attr('value')).length > 0) { + $.ajax({ + 'url' : '{{ url_for("fetchdddata") }}', + 'data' : {'email' : $('#email').attr('value')}, + 'dataType' : 'json', + 'success' : updateFields, + 'error' : function(request, textStatus, errorThrown) { + $('#email').focus(); + } + }); + } +} + +$(document).ready(function() { + for (var index in defaulthiddendivs) { + if (!$(defaulthiddendivs[index]).hasClass('witherrors')) { + $(defaulthiddendivs[index]).hide(); + } + } + + $('#showall').attr('checked', false).change(onChangeShowAll); + $('#showallfield').show(); + $('#email').blur(onBlurEmail).focus(); +}); diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py new file mode 100644 index 0000000..233800d --- /dev/null +++ b/debianmemberportfolio/views.py @@ -0,0 +1,42 @@ +from debianmemberportfolio import app, babel +from flask import g, make_response, request, render_template +from config import LANGUAGES +from .forms import DeveloperData + + +@babel.localeselector +def get_locale(): + return request.accept_languages.best_match(LANGUAGES.keys()) + + +@app.before_request +def before_request(): + g.locale = get_locale() + + +@app.route('/') +def index(): + form = DeveloperData() + # TODO: replicate behavior of + # debianmemberportfolio.controllers.portfolio.PortfolioController.index + return render_template('showform.html', form=form) + + +@app.route('/result') +def urllist(): + form = DeveloperData(request.values) + if form.validate(): + return render_template('showurls.html') + return render_template('showform.html', form=form) + + +@app.route('/htmlformhelper.js') +def formhelper_js(): + response = make_response(render_template('showformscript.js')) + response.headers['Content-Type'] = 'text/javascript; charset=utf-8' + return response + + +@app.route('/showformscripts/fetchdddata/') +def fetchdddata(): + return 'dddata' diff --git a/run.py b/run.py new file mode 100755 index 0000000..715fe63 --- /dev/null +++ b/run.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python2 +from debianmemberportfolio import app + +if __name__ == '__main__': + app.debug = True + app.run() From cf04f6f0cb6fc5b5a633b4cc7128f2748321055a Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 25 Sep 2015 12:08:48 +0200 Subject: [PATCH 10/22] port keyringanalyzer to Python3 - ran through 2to3 - switch to new ConfigParser name - fix UTF-8 handling of gpg output - don't track tags and keyringcache.db in git --- .gitignore | 2 ++ debianmemberportfolio/model/keyringanalyzer.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3b423a9..98a8e38 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ data/ .ropeproject/ *.mo *.pot +tags +debianmemberportfolio/model/keyringcache.db diff --git a/debianmemberportfolio/model/keyringanalyzer.py b/debianmemberportfolio/model/keyringanalyzer.py index 09a5315..8af8962 100644 --- a/debianmemberportfolio/model/keyringanalyzer.py +++ b/debianmemberportfolio/model/keyringanalyzer.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service application key ring analyzer tool # -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -26,10 +26,10 @@ retrieved data in a file database. The tool was inspired by Debian qa's carnivore. """ -import anydbm +import dbm import pkg_resources import glob -import ConfigParser +import configparser import os import os.path import logging @@ -38,7 +38,7 @@ import sys import email.utils -CONFIG = ConfigParser.SafeConfigParser() +CONFIG = configparser.ConfigParser() def _get_keyrings(): @@ -160,11 +160,11 @@ def process_keyrings(): stdout=subprocess.PIPE) fpr = None for line in proc.stdout.readlines(): - fpr = process_gpg_list_keys_line(line, fpr) + fpr = process_gpg_list_keys_line(line.decode('utf8'), fpr) retcode = proc.wait() if retcode != 0: logging.error("subprocess ended with return code %d", retcode) - db = anydbm.open(pkg_resources.resource_filename(__name__, + db = dbm.open(pkg_resources.resource_filename(__name__, 'keyringcache'), 'c') for key in resultdict: db[key] = ":".join(resultdict[key]) @@ -173,9 +173,9 @@ def process_keyrings(): if __name__ == '__main__': logging.basicConfig(stream=sys.stderr, level=logging.WARNING) - CONFIG.readfp(pkg_resources.resource_stream( - __name__, 'portfolio.ini')) + CONFIG.read_string(pkg_resources.resource_string( + __name__, 'portfolio.ini').decode('utf8')) gpghome = os.path.expanduser(CONFIG.get('DEFAULT', 'gnupghome')) if not os.path.isdir(gpghome): - os.makedirs(gpghome, 0700) + os.makedirs(gpghome, 0o700) process_keyrings() From fdd97270d6146a3cdf8d692d12f4bd5200061f68 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 19:58:20 +0100 Subject: [PATCH 11/22] add some jessie requirements for flask --- jessiereq.pip | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jessiereq.pip b/jessiereq.pip index 86dc4d0..61861cb 100644 --- a/jessiereq.pip +++ b/jessiereq.pip @@ -1,14 +1,15 @@ Flask==0.10.1 -Jinja2==2.7.3 +Jinja2==2.8 MarkupSafe==0.23 -Werkzeug==0.9.6 +Werkzeug==0.10.4 itsdangerous==0.24 -Babel==1.3 -pytz==2012c +Babel==2.1.post20150925 Flask-Babel==0.9 +pytz==2015.6 speaklater==1.3 Flask-WTF==0.10.2 WTForms==2.0.1 +#Babel==1.3 #Beaker==1.6.4 #FormEncode==1.2.6 #Mako==1.0.0 From 8dd7b5ad848b22c64cd533d6eb966d0152f65daa Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 22:44:34 +0100 Subject: [PATCH 12/22] Use Jessie versions of dependencies --- jessiereq.pip | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jessiereq.pip b/jessiereq.pip index 61861cb..ecb99be 100644 --- a/jessiereq.pip +++ b/jessiereq.pip @@ -1,11 +1,11 @@ Flask==0.10.1 -Jinja2==2.8 +Jinja2==2.7.3 MarkupSafe==0.23 -Werkzeug==0.10.4 +Werkzeug==0.9.6 itsdangerous==0.24 -Babel==2.1.post20150925 +Babel==1.3 Flask-Babel==0.9 -pytz==2015.6 +pytz==2012c speaklater==1.3 Flask-WTF==0.10.2 WTForms==2.0.1 From 2e3cb7aa647ac962af24554b9619f9165b38f1a5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 23:18:22 +0100 Subject: [PATCH 13/22] Implement better GPG output decoding --- debianmemberportfolio/model/keyringanalyzer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debianmemberportfolio/model/keyringanalyzer.py b/debianmemberportfolio/model/keyringanalyzer.py index 8af8962..9ea3fab 100644 --- a/debianmemberportfolio/model/keyringanalyzer.py +++ b/debianmemberportfolio/model/keyringanalyzer.py @@ -160,7 +160,11 @@ def process_keyrings(): stdout=subprocess.PIPE) fpr = None for line in proc.stdout.readlines(): - fpr = process_gpg_list_keys_line(line.decode('utf8'), fpr) + try: + line = line.decode('utf8') + except UnicodeDecodeError: + line = line.decode('iso8859-1') + fpr = process_gpg_list_keys_line(line, fpr) retcode = proc.wait() if retcode != 0: logging.error("subprocess ended with return code %d", retcode) From 298b12775b59e6e76609cb773ee14e81a24b6f57 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 10 Nov 2015 23:26:07 +0100 Subject: [PATCH 14/22] Fix compatibility with newer jQuery --- .../templates/showformscript.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/debianmemberportfolio/templates/showformscript.js b/debianmemberportfolio/templates/showformscript.js index 10d54cd..74c0151 100644 --- a/debianmemberportfolio/templates/showformscript.js +++ b/debianmemberportfolio/templates/showformscript.js @@ -29,13 +29,13 @@ var allfielddivs = new Array( function updateFields(data, textStatus) { if (data.type == 2) { // DD - $('#name').attr('value', data.name).attr('readonly', 'readonly'); - $('#gpgfp').attr('value', data.gpgfp); - $('#username').attr('value', data.username).attr( + $('#name').prop('value', data.name).prop('readonly', 'readonly'); + $('#gpgfp').prop('value', data.gpgfp); + $('#username').prop('value', data.username).prop( 'readonly', 'readonly'); - $('#nonddemail').attr('value', data.email).focus(); - $('#aliothusername').attr('value', data.username); - $('#wikihomepage').attr('value', data.wikihomepage); + $('#nonddemail').prop('value', data.email).focus(); + $('#aliothusername').prop('value', data.username); + $('#wikihomepage').prop('value', data.wikihomepage); $('#namefield').show(); $('#gpgfpfield').show(); @@ -47,11 +47,11 @@ function updateFields(data, textStatus) { $('#nonddemail').focus().select(); } else if (data.type == 1) { // DM - $('#name').attr('value', data.name).attr('readonly', 'readonly'); - $('#gpgfp').attr('value', data.gpgfp); - $('#username').attr('value', ''); - $('#nonddemail').attr('value', data.email).focus(); - $('#wikihomepage').attr('value', data.wikihomepage); + $('#name').prop('value', data.name).prop('readonly', 'readonly'); + $('#gpgfp').prop('value', data.gpgfp); + $('#username').prop('value', ''); + $('#nonddemail').prop('value', data.email).focus(); + $('#wikihomepage').prop('value', data.wikihomepage); $('#namefield').show(); $('#gpgfpfield').show(); @@ -63,10 +63,10 @@ function updateFields(data, textStatus) { $('#aliothusername').focus().select(); } else { - $('#nonddemail').attr('value', data.email); + $('#nonddemail').prop('value', data.email); $('#name').removeAttr('readonly'); - $('#username').removeAttr('readonly').attr('value', ''); - $('#gpgfp').attr('value', ''); + $('#username').removeAttr('readonly').prop('value', ''); + $('#gpgfp').prop('value', ''); $('#usernamefield').hide(); $('#gpgfpfield').hide(); @@ -81,7 +81,7 @@ function updateFields(data, textStatus) { } function onChangeShowAll(event) { - if ($('#showall').attr('checked')) { + if ($('#showall').prop('checked')) { for (var fielddiv in allfielddivs) { $(allfielddivs[fielddiv]).show(); } @@ -93,10 +93,10 @@ function onChangeShowAll(event) { } function onBlurEmail() { - if ($.trim($('#email').attr('value')).length > 0) { + if ($.trim($('#email').prop('value')).length > 0) { $.ajax({ 'url' : '{{ url_for("fetchdddata") }}', - 'data' : {'email' : $('#email').attr('value')}, + 'data' : {'email' : $('#email').prop('value')}, 'dataType' : 'json', 'success' : updateFields, 'error' : function(request, textStatus, errorThrown) { @@ -113,7 +113,7 @@ $(document).ready(function() { } } - $('#showall').attr('checked', false).change(onChangeShowAll); + $('#showall').prop('checked', false).change(onChangeShowAll); $('#showallfield').show(); $('#email').blur(onBlurEmail).focus(); }); From 104e6701ebc32f1e4f361c60375a9c60c268600b Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 11 Nov 2015 00:47:38 +0100 Subject: [PATCH 15/22] Add Stretch dependency versions --- stretch.pip | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 stretch.pip diff --git a/stretch.pip b/stretch.pip new file mode 100644 index 0000000..f8ad1c2 --- /dev/null +++ b/stretch.pip @@ -0,0 +1,29 @@ +Flask==0.10.1 +Jinja2==2.8 +MarkupSafe==0.23 +Werkzeug==0.10.4 +itsdangerous==0.24 +Babel==1.3 +Flask-Babel==0.9 +pytz==2012c +speaklater==1.3 +Flask-WTF==0.12 +WTForms==2.0.2 +#Babel==1.3 +#Beaker==1.6.4 +#FormEncode==1.2.6 +#Mako==1.0.0 +#MarkupSafe==0.23 +#Paste==1.7.5.1 +#PasteDeploy==1.5.2 +#PasteScript==1.7.5 +#Pygments==2.0.1 +#Pylons==1.0.1 +#Routes==2.0 +#Tempita==0.5.2 +#WebError==0.10.3 +#WebHelpers==1.3 +#WebOb==1.4 +#WebTest==2.0.16 +#nose==1.3.4 +#simplejson==3.6.5 From 52066eb90439f65dc83537ffdac7254f88aaac30 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 11 Nov 2015 00:48:01 +0100 Subject: [PATCH 16/22] Port dddatabuilder and keyfinder to Python3 --- debianmemberportfolio/model/dddatabuilder.py | 2 +- debianmemberportfolio/model/keyfinder.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debianmemberportfolio/model/dddatabuilder.py b/debianmemberportfolio/model/dddatabuilder.py index 9a52be2..c168489 100644 --- a/debianmemberportfolio/model/dddatabuilder.py +++ b/debianmemberportfolio/model/dddatabuilder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service data builder # -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # diff --git a/debianmemberportfolio/model/keyfinder.py b/debianmemberportfolio/model/keyfinder.py index 452d261..5129e54 100644 --- a/debianmemberportfolio/model/keyfinder.py +++ b/debianmemberportfolio/model/keyfinder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service key finder module # -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -36,14 +36,17 @@ cachetimestamp = 0 def _get_keyring_cache(): global db, cachetimestamp if db is None or (time.time() - cachetimestamp) > 86300: - import anydbm + import dbm import pkg_resources import os.path filename = pkg_resources.resource_filename(__name__, 'keyringcache') logging.debug('reading cache data from %s', filename) - assert os.path.exists(filename) and os.path.isfile(filename) - db = anydbm.open(filename, 'r') + assert ( + os.path.exists(filename + '.db') and + os.path.isfile(filename + '.db') + ) + db = dbm.open(filename, 'r') cachetimestamp = time.time() return db @@ -53,7 +56,7 @@ def _get_cached(cachekey): logging.debug('cache lookup for %s', cachekey) if cachekey in cache: logging.debug('found entry %s', cache[cachekey]) - return cache[cachekey] + return cache[cachekey].decode('utf8') return None @@ -91,7 +94,7 @@ def getLoginByFingerprint(fpr): def _dump_cache(): cache = _get_keyring_cache() fprs = [] - for key in cache.keys(): + for key in [key.decode('utf8') for key in list(cache.keys())]: if key.startswith('email:fpr:'): fpr = key.replace('email:fpr:', '') if not fpr in fprs: @@ -102,8 +105,8 @@ def _dump_cache(): email = _get_cached('email:fpr:%s' % fpr) name = _get_cached('name:fpr:%s' % fpr) - print fpr, login, ':' - print ' ', name, email + print(fpr, login, ':') + print(' ', name, email) if __name__ == '__main__': From 1c86f707fa0f8d04bbd2d6c7621d61e69e7ed2a5 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 11 Nov 2015 00:49:12 +0100 Subject: [PATCH 17/22] Implement fetchdddata view --- debianmemberportfolio/forms.py | 4 ++++ debianmemberportfolio/views.py | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py index 9f988a5..0155656 100644 --- a/debianmemberportfolio/forms.py +++ b/debianmemberportfolio/forms.py @@ -33,3 +33,7 @@ class DeveloperData(Form): forumsid = IntegerField('forumsid', default=None, validators=[Optional()]) wikihomepage = StringField('wikihomepage', default=None, validators=[ Optional()]) + + +class DeveloperDataRequest(Form): + email = StringField('email', validators=[DataRequired(), Email()]) diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py index 233800d..a8fa654 100644 --- a/debianmemberportfolio/views.py +++ b/debianmemberportfolio/views.py @@ -1,7 +1,13 @@ +import json +import logging + from debianmemberportfolio import app, babel -from flask import g, make_response, request, render_template +from flask import g, make_response, request, render_template, abort from config import LANGUAGES -from .forms import DeveloperData +from .forms import DeveloperData, DeveloperDataRequest +from .model import dddatabuilder + +log = logging.getLogger(__name__) @babel.localeselector @@ -39,4 +45,14 @@ def formhelper_js(): @app.route('/showformscripts/fetchdddata/') def fetchdddata(): - return 'dddata' + form = DeveloperDataRequest(request.values) + if form.validate(): + fields = dddatabuilder.build_data(form.data['email']) + log.debug(fields) + response = make_response(json.dumps(fields)) + response.headers['Content-Type'] = 'application/json' + return response + abort( + 400, + "\n".join(["%s: %s" % (key, form.errors[key]) for key in form.errors]) + ) From 43ade2d35ee680fda139f53148c066eb94ee6958 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 11 Nov 2015 00:50:28 +0100 Subject: [PATCH 18/22] Port showform template to Jinja2 --- debianmemberportfolio/forms.py | 9 +- debianmemberportfolio/templates/showform.html | 63 +++++++ debianmemberportfolio/templates/showform.mako | 164 ------------------ 3 files changed, 69 insertions(+), 167 deletions(-) delete mode 100644 debianmemberportfolio/templates/showform.mako diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py index 0155656..f35d02a 100644 --- a/debianmemberportfolio/forms.py +++ b/debianmemberportfolio/forms.py @@ -1,7 +1,8 @@ from __future__ import unicode_literals +from flask.ext.babel import gettext as _ from flask.ext.wtf import Form -from wtforms import IntegerField, StringField +from wtforms import IntegerField, StringField, RadioField from wtforms.validators import ( AnyOf, DataRequired, Email, Length, Optional, Regexp ) @@ -27,8 +28,10 @@ class DeveloperData(Form): username = StringField('username', validators=[PlainText()]) nonddemail = StringField('nonddemail', validators=[Email()]) aliothusername = StringField('aliothusername', validators=[PlainText()]) - mode = StringField( - 'mode', default='html',validators=[AnyOf(['json', 'html'])] + mode = RadioField( + 'mode', default='html', choices=[ + ('json', _('JSON')), ('html', _('HTML')) + ], validators=[AnyOf(['json', 'html'])] ) forumsid = IntegerField('forumsid', default=None, validators=[Optional()]) wikihomepage = StringField('wikihomepage', default=None, validators=[ diff --git a/debianmemberportfolio/templates/showform.html b/debianmemberportfolio/templates/showform.html index fac47d8..e0b40c0 100644 --- a/debianmemberportfolio/templates/showform.html +++ b/debianmemberportfolio/templates/showform.html @@ -35,6 +35,69 @@ with this program. If not, see .
{{ form.email }}
+ +
+
+ {{ form.name }} +
+
+
+ {{ form.gpgfp }} +
+
+
+ {{ form.username }} +
+
+
+ {{ form.nonddemail }} +
+
+
+ {{ form.aliothusername }} +
+
+
+ {{ form.wikihomepage }} +
+
+
+ {{ form.forumsid }} +
+
+
+ {% for subfield in form.mode %} + {{ subfield.label }} {{ subfield }} + {% endfor %}
+ +
{% endblock %} diff --git a/debianmemberportfolio/templates/showform.mako b/debianmemberportfolio/templates/showform.mako deleted file mode 100644 index 32a8233..0000000 --- a/debianmemberportfolio/templates/showform.mako +++ /dev/null @@ -1,164 +0,0 @@ -## -- coding: utf-8 -- \ -<%inherit file="base.mako" /> -<%doc> -Template for the data input form. - -Copyright © 2009-2014 Jan Dittberner - -This file is part of the Debian Member Portfolio service. - -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 -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 License along -with this program. If not, see . - -<%def name="titleaddon()"> - - ${_('Enter your personal information')} - -<%def name="extrahead()">${h.javascript_link('/javascript/jquery/jquery.js', -h.url(controller='showformscripts', action='index'))} -${h.form(h.url(action='urllist', controller='portfolio'), method='get')} -
- ${_('Debian Member Portfolio')} -
-
- ${h.text('email', - h.escape(request.params.get('email', None)), id='email')}
-
- -
-
- ${h.text('name', - h.escape(request.params.get('name', None)), id='name')}
-
-
-
- ${h.text('gpgfp', - h.escape(request.params.get('gpgfp', None)), - id='gpgfp')}
-
-
-
- ${h.text('username', - h.escape(request.params.get('username', None)), - id='username')}
-
-
-
- ${h.text('nonddemail', - h.escape(request.params.get('nonddemail', None)), - id='nonddemail')}
-
-
-
- ${h.text('aliothusername', - h.escape(request.params.get('username', None)), - id='aliothusername')}
-
-
-
- ${h.text('wikihomepage', - h.escape(request.params.get('wikihomepage', None)), - id='wikihomepage')}
-
-
-
- ${h.text('forumsid', - h.escape(request.params.get('forumsid', None)), - id='forumsid')}
-
-
-
- ${_('HTML')} ${h.radio('mode', 'html', - checked=(request.params.get('mode', - 'html') == 'html'))} ${_('JSON')} ${h.radio('mode', - 'json', checked=(request.params.get('mode', 'html') == 'json'))}
- ${h.submit('submit', value=_('Build Debian Member Portfolio URLs'))} -
-
-${h.end_form()} From b7fe1328bb98f78fa4da061df63de06fb6ebd9b2 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 12 Nov 2015 21:11:48 +0100 Subject: [PATCH 19/22] Add result view implementation This commit implements the result view and template. - fix Python3 configparser interpolation error in portfolio.ini - debianmemberportfolio.model.urlbuilder ported to Python3 - add showurls.html as a direct Jinja port of showurls.mako - implement functionality in debianmemberportfolio.views.result --- debianmemberportfolio/model/portfolio.ini | 2 +- debianmemberportfolio/model/urlbuilder.py | 22 ++- debianmemberportfolio/templates/showurls.html | 61 +++++++ debianmemberportfolio/views.py | 166 +++++++++++++++++- 4 files changed, 238 insertions(+), 13 deletions(-) create mode 100644 debianmemberportfolio/templates/showurls.html diff --git a/debianmemberportfolio/model/portfolio.ini b/debianmemberportfolio/model/portfolio.ini index c2bcb7a..097042f 100644 --- a/debianmemberportfolio/model/portfolio.ini +++ b/debianmemberportfolio/model/portfolio.ini @@ -83,7 +83,7 @@ webid.optional=true alioth.pattern=https://alioth.debian.org/users/%(aliothusername)s/ alioth.optional=true wiki.pattern=https://wiki.debian.org/%(wikihomepage)s -forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)d +forum.pattern=http://forums.debian.net/memberlist.php?mode=viewprofile&u=%(forumsid)s forum.optional=true [miscellaneous] diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py index 33178a5..26e786d 100644 --- a/debianmemberportfolio/model/urlbuilder.py +++ b/debianmemberportfolio/model/urlbuilder.py @@ -3,7 +3,7 @@ # # Debian Member Portfolio Service url builder # -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -26,15 +26,18 @@ URLs using the given information and the URL patterns defined in portfolio.ini. """ -from ConfigParser import ConfigParser, InterpolationMissingOptionError +from configparser import ConfigParser, InterpolationMissingOptionError +from encodings.utf_8 import StreamReader as UTF8StreamReader + import pkg_resources from debianmemberportfolio.model import keyfinder -from urllib import quote_plus -from pylons.i18n.translation import _, N_ +from urllib.parse import quote_plus +from flask.ext.babel import gettext as _, lazy_gettext as N_ my_config = ConfigParser() -my_config.readfp(pkg_resources.resource_stream(__name__, 'portfolio.ini')) +my_config.read_file(UTF8StreamReader( + pkg_resources.resource_stream(__name__, 'portfolio.ini'))) _FIELDNAMES_MAP = { 'email': N_('Email address'), @@ -62,14 +65,15 @@ def _build_quoted_fields(fields): Take a dictionary of raw field values and quote the values if required. """ qfields = {} - for key, value in fields.iteritems(): + for key, value in fields.items(): if value is not None: - if isinstance(value, unicode): + if isinstance(value, str): qfields[key] = quote_plus(value.encode('utf8')) elif isinstance(value, str): qfields[key] = quote_plus(value) else: qfields[key] = value + qfields[key] = qfields[key].replace('%', '%%') if 'gpgfp' not in qfields: fpr = keyfinder.getFingerprintByEmail(fields['email'].encode('utf8')) @@ -97,8 +101,8 @@ def build_urls(fields): data.append( ['url', section, entry, my_config.get(section, entry.name + '.pattern', - False, qfields)]) - except InterpolationMissingOptionError, e: + raw=False, vars=qfields)]) + except InterpolationMissingOptionError as e: if not entry.optional: if e.reference in _FIELDNAMES_MAP: data.append(['error', section, entry, diff --git a/debianmemberportfolio/templates/showurls.html b/debianmemberportfolio/templates/showurls.html new file mode 100644 index 0000000..4b5165b --- /dev/null +++ b/debianmemberportfolio/templates/showurls.html @@ -0,0 +1,61 @@ +{% extends "base.html" %} +{# +Template for the url output page. +Copyright © 2009-2015 Jan Dittberner + +This file is part of Debian Member Portfolio Service. + +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 +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 License along +with this program. If not, see . +#} +{% block title %}{{ super() }} - {{ _('Your personal links') }}{% endblock %} +{% block body %}{{ super() }} +{% if urldata %} +
+ {{ _('Debian Member Porfolio') }} + + + + + + {% for row in urldata %} + {% if row[0] == 'section' %} + + {% set urlclass = 'odd' %} + {% elif row[0] == 'error' %} + + + + + {% else %} + + + + + {% if urlclass == "odd" %}{% set urlclass = "even" %}{% else %}{% set urlclass = "odd" %}{% endif %} + {% endif %} + {% endfor %} + +
{{ _('Usage') }}{{ _('URL') }}
{{ row[2] }}
{{ row[4] }}{{ _('Error during URL creation:') }} + {{ row[3]|replace("\n", "
") }}
{{ row[4]|safe }} + {% if row[2].type == 'url' %} + {{ row[3]|truncate(120) }} + {% else %} + {{ row[3] }} + {% endif %} +
+
+{% endif %} +

{{ _('Restart') }}

+{% endblock body %} + diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py index a8fa654..70455db 100644 --- a/debianmemberportfolio/views.py +++ b/debianmemberportfolio/views.py @@ -1,14 +1,144 @@ +# -*- python -*- +# -*- coding: utf-8 -*- +# +# Debian Member Portfolio Service views +# +# Copyright © 2015 Jan Dittberner +# +# This file is part of the Debian Member Portfolio Service. +# +# 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 +# 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 License +# along with this program. If not, see . +# import json import logging from debianmemberportfolio import app, babel from flask import g, make_response, request, render_template, abort +from flask.ext.babel import gettext as _, lazy_gettext as N_ from config import LANGUAGES from .forms import DeveloperData, DeveloperDataRequest from .model import dddatabuilder +from .model.urlbuilder import build_urls log = logging.getLogger(__name__) +#: This dictionary defines groups of labeled portfolio items. +_LABELS = { + 'overview': { + 'label': N_('Overview'), + '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 +(note: co-maintainers not listed, see \ +#430986)'''), + 'reported': N_('bugs reported'), + 'usertags': N_('user tags'), + 'searchall': N_('all messages (i.e., full text search for \ +developer name on all bug logs)'), + 'wnpp': N_('WNPP'), + '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'), + 'lintian': N_('lintian reports'), + 'lintianfull': N_('full lintian reports (i.e. including \ +"info"-level messages)'), + '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'), + 'dbfinger': N_('DB information via finger'), + 'db': N_('DB information via HTTP'), + 'webid': N_('FOAF profile'), + 'alioth': N_('Alioth'), + 'wiki': N_('Wiki'), + 'forum': N_('Forum'), + }, + 'miscellaneous': { + 'label': N_('Miscellaneous'), + 'debtags': N_('debtags'), + 'planetname': N_('Planet Debian (name)'), + 'planetuser': N_('Planet Debian (username)'), + 'links': N_('links'), + 'website': N_('Debian website'), + 'search': N_('Debian search'), + 'gpgfinger': N_('GPG public key via finger'), + '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_('MIA database information'), + 'groupinfo': N_('Group membership information'), + }, + 'ubuntu': { + 'label': N_('Ubuntu'), + 'ubuntudiff': N_('Available patches from Ubuntu'), + }, +} + +#: list of field name tuples for Debian Maintainers +DM_TUPLES = (('name', 'name'), + ('gpgfp', 'gpgfp'), + ('nonddemail', 'email')) + +#: list of field name tuples for Debian Developers +DD_TUPLES = (('username', 'username'), + ('aliothusername', 'username')) + + +def _get_label(section, url=None): + if section in _LABELS: + if url: + if url in _LABELS[section]: + return _LABELS[section][url] + elif 'label' in _LABELS[section]: + return _LABELS[section]['label'] + if url: + return "%s.%s" % (section, url) + return section + @babel.localeselector def get_locale(): @@ -23,8 +153,6 @@ def before_request(): @app.route('/') def index(): form = DeveloperData() - # TODO: replicate behavior of - # debianmemberportfolio.controllers.portfolio.PortfolioController.index return render_template('showform.html', form=form) @@ -32,7 +160,39 @@ def index(): def urllist(): form = DeveloperData(request.values) if form.validate(): - return render_template('showurls.html') + fields = dddatabuilder.build_data(form.data['email']) + rp = request.values + + if fields['type'] in (dddatabuilder.TYPE_DD, dddatabuilder.TYPE_DM): + for dmtuple in DM_TUPLES: + if not dmtuple[0] in rp or not rp[dmtuple[0]]: + rp[dmtuple[0]] = fields[dmtuple[1]] + if fields['type'] == dddatabuilder.TYPE_DD: + for ddtuple in DD_TUPLES: + if not ddtuple[0] in rp or not rp[ddtuple[0]]: + rp[ddtuple[0]] = fields[ddtuple[1]] + if form.data['wikihomepage'] is None: + log.debug('generate wikihomepage from name') + form.data['wikihomepage'] = "".join([ + part.capitalize() for part in form.data['name'].split() + ]) + + data = build_urls(form.data) + + if form.data['mode'] == 'json': + response = make_response(json.dumps(dict( + [("{}.{}".format(entry[1], entry[2].name), entry[3]) + for entry in data if entry[0] == 'url']))) + response.headers['Content-Type'] = 'application/json' + return response + + for entry in data: + if entry[0] in ('url', 'error'): + entry.append(_get_label(entry[1], entry[2].name)) + elif entry[0] == 'section': + entry.append(_get_label(entry[1])) + + return render_template('showurls.html', urldata=data) return render_template('showform.html', form=form) From c9ae85c2c1840f9bd8ad5ebacadcbc926024ac8c Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 12 Nov 2015 22:18:23 +0100 Subject: [PATCH 20/22] Remove Pylons remains --- attic/config/__init__.py | 22 -- attic/config/deployment.ini_tmpl | 60 ----- attic/config/environment.py | 75 ------- attic/config/middleware.py | 95 -------- attic/config/routing.py | 58 ----- debianmemberportfolio/controllers/__init__.py | 22 -- debianmemberportfolio/controllers/error.py | 70 ------ .../controllers/portfolio.py | 212 ------------------ .../controllers/showformscripts.py | 75 ------- debianmemberportfolio/controllers/template.py | 55 ----- debianmemberportfolio/lib/__init__.py | 22 -- debianmemberportfolio/lib/app_globals.py | 43 ---- debianmemberportfolio/lib/base.py | 55 ----- debianmemberportfolio/lib/helpers.py | 35 --- debianmemberportfolio/model/form.py | 51 ----- debianmemberportfolio/templates/base.mako | 52 ----- .../templates/showformscript.mako | 122 ---------- debianmemberportfolio/templates/showurls.mako | 67 ------ debianmemberportfolio/tests/__init__.py | 59 ----- .../tests/functional/__init__.py | 22 -- .../tests/functional/test_portfolio.py | 43 ---- .../tests/functional/test_showformscripts.py | 44 ---- debianmemberportfolio/tests/test_models.py | 22 -- development.ini | 73 ------ jessiereq.pip | 29 --- test.ini | 21 -- 26 files changed, 1504 deletions(-) delete mode 100644 attic/config/__init__.py delete mode 100644 attic/config/deployment.ini_tmpl delete mode 100644 attic/config/environment.py delete mode 100644 attic/config/middleware.py delete mode 100644 attic/config/routing.py delete mode 100644 debianmemberportfolio/controllers/__init__.py delete mode 100644 debianmemberportfolio/controllers/error.py delete mode 100644 debianmemberportfolio/controllers/portfolio.py delete mode 100644 debianmemberportfolio/controllers/showformscripts.py delete mode 100644 debianmemberportfolio/controllers/template.py delete mode 100644 debianmemberportfolio/lib/__init__.py delete mode 100644 debianmemberportfolio/lib/app_globals.py delete mode 100644 debianmemberportfolio/lib/base.py delete mode 100644 debianmemberportfolio/lib/helpers.py delete mode 100644 debianmemberportfolio/model/form.py delete mode 100644 debianmemberportfolio/templates/base.mako delete mode 100644 debianmemberportfolio/templates/showformscript.mako delete mode 100644 debianmemberportfolio/templates/showurls.mako delete mode 100644 debianmemberportfolio/tests/__init__.py delete mode 100644 debianmemberportfolio/tests/functional/__init__.py delete mode 100644 debianmemberportfolio/tests/functional/test_portfolio.py delete mode 100644 debianmemberportfolio/tests/functional/test_showformscripts.py delete mode 100644 debianmemberportfolio/tests/test_models.py delete mode 100644 development.ini delete mode 100644 jessiereq.pip delete mode 100644 test.ini diff --git a/attic/config/__init__.py b/attic/config/__init__.py deleted file mode 100644 index 7900219..0000000 --- a/attic/config/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service config package -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# diff --git a/attic/config/deployment.ini_tmpl b/attic/config/deployment.ini_tmpl deleted file mode 100644 index 116ca29..0000000 --- a/attic/config/deployment.ini_tmpl +++ /dev/null @@ -1,60 +0,0 @@ -# -# Debian Member Portfolio Service - Pylons configuration -# -# The %(here)s variable will be replaced with the parent directory of this file -# -[DEFAULT] -debug = true -email_to = you@yourdomain.com -smtp_server = localhost -error_email_from = paste@localhost - -[server:main] -use = egg:Paste#http -host = 0.0.0.0 -port = 5000 - -[app:main] -use = egg:debianmemberportfolio -full_stack = true -static_files = true - -cache_dir = %(here)s/data -beaker.session.key = debianmemberportfolio -beaker.session.secret = ${app_instance_secret} -app_instance_uuid = ${app_instance_uuid} - -# If you'd like to fine-tune the individual locations of the cache data dirs -# for the Cache data, or the Session saves, un-comment the desired settings -# here: -#beaker.cache.data_dir = %(here)s/data/cache -#beaker.session.data_dir = %(here)s/data/sessions - -# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* -# Debug mode will enable the interactive debugging tool, allowing ANYONE to -# execute malicious code after an exception is raised. -set debug = false - - -# Logging configuration -[loggers] -keys = root - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = INFO -handlers = console - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s] [%(threadName)s] %(message)s diff --git a/attic/config/environment.py b/attic/config/environment.py deleted file mode 100644 index feabd91..0000000 --- a/attic/config/environment.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service environment configuration -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -Pylons environment configuration - -""" - -import os - -from mako.lookup import TemplateLookup -from pylons.configuration import PylonsConfig -from pylons.error import handle_mako_error - -import debianmemberportfolio.lib.app_globals as app_globals -import debianmemberportfolio.lib.helpers -from debianmemberportfolio.config.routing import make_map - - -def load_environment(global_conf, app_conf): - """ - Configures the Pylons environment via the ``pylons.config`` object. - """ - config = PylonsConfig() - - # Pylons paths - root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - paths = dict(root=root, - controllers=os.path.join(root, 'controllers'), - static_files=os.path.join(root, 'public'), - templates=[os.path.join(root, 'templates')]) - - # Initialize config with the basic options - config.init_app( - global_conf, app_conf, package='debianmemberportfolio', paths=paths) - - config['routes.map'] = make_map(config) - config['pylons.app_globals'] = app_globals.Globals(config) - config['pylons.h'] = debianmemberportfolio.lib.helpers - - # Setup cache object as early as possible - import pylons - pylons.cache._push_object(config['pylons.app_globals'].cache) - - # Create the Mako TemplateLookup, with the default auto-escaping - config['pylons.app_globals'].mako_lookup = TemplateLookup( - directories=paths['templates'], - error_handler=handle_mako_error, - module_directory=os.path.join(app_conf['cache_dir'], 'templates'), - input_encoding='utf-8', default_filters=['escape'], - imports=['from webhelpers.html import escape']) - - # CONFIGURATION OPTIONS HERE (note: all config options will override - # any Pylons config options) - - return config diff --git a/attic/config/middleware.py b/attic/config/middleware.py deleted file mode 100644 index 9dd80ae..0000000 --- a/attic/config/middleware.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service middleware configuration -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -Pylons middleware initialization - -""" - -from beaker.middleware import SessionMiddleware -from paste.cascade import Cascade -from paste.registry import RegistryManager -from paste.urlparser import StaticURLParser -from paste.deploy.converters import asbool -from pylons.middleware import ErrorHandler, StatusCodeRedirect -from pylons.wsgiapp import PylonsApp -from routes.middleware import RoutesMiddleware - -from debianmemberportfolio.config.environment import load_environment - - -def make_app(global_conf, full_stack=True, static_files=True, **app_conf): - """ - Create a Pylons WSGI application and return it - - ``global_conf`` - The inherited configuration for this application. Normally from - the [DEFAULT] section of the Paste ini file. - - ``full_stack`` - Whether this application provides a full WSGI stack (by default, - meaning it handles its own exceptions and errors). Disable - full_stack when this application is "managed" by another WSGI - middleware. - - ``static_files`` - Whether this application serves its own static files; disable - when another web server is responsible for serving them. - - ``app_conf`` - The application's local configuration. Normally specified in - the [app:] section of the Paste ini file (where - defaults to main). - - """ - # Configure the Pylons environment - config = load_environment(global_conf, app_conf) - - # The Pylons WSGI app - app = PylonsApp(config=config) - - # Routing/Session/Cache Middleware - app = RoutesMiddleware(app, config['routes.map']) - app = SessionMiddleware(app, config) - - # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares) - - if asbool(full_stack): - # Handle Python exceptions - app = ErrorHandler(app, global_conf, **config['pylons.errorware']) - - # Display error documents for 401, 403, 404 status codes (and - # 500 when debug is disabled) - if asbool(config['debug']): - app = StatusCodeRedirect(app) - else: - app = StatusCodeRedirect(app, [400, 401, 403, 404, 500]) - - # Establish the Registry for this application - app = RegistryManager(app) - - if asbool(static_files): - # Serve static files - static_app = StaticURLParser(config['pylons.paths']['static_files']) - app = Cascade([static_app, app]) - app.config = config - return app diff --git a/attic/config/routing.py b/attic/config/routing.py deleted file mode 100644 index 39a9d38..0000000 --- a/attic/config/routing.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service routing configuration -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -Routes configuration - -The more specific and detailed routes should be defined first so they -may take precedent over the more generic routes. For more information -refer to the routes manual at https://routes.readthedocs.org/ - -""" - -from routes import Mapper - - -def make_map(config): - """ - Create, configure and return the routes Mapper - - """ - map = Mapper(directory=config['pylons.paths']['controllers'], - always_scan=config['debug'], explicit=True) - map.minimization = False - - # The ErrorController route (handles 404/500 error pages); it should - # likely stay at the top, ensuring it can always be resolved - map.connect('/error/{action}', controller='error') - map.connect('/error/{action}/{id}', controller='error') - - # CUSTOM ROUTES HERE - map.connect('/', controller='portfolio', action='index') - map.connect('/result', controller='portfolio', action='urllist') - map.connect('/htmlformhelper.js', controller='showformscripts', - action='index') - - map.connect('/{controller}/{action}') - map.connect('/{controller}/{action}/{id}') - - return map diff --git a/debianmemberportfolio/controllers/__init__.py b/debianmemberportfolio/controllers/__init__.py deleted file mode 100644 index eda4d33..0000000 --- a/debianmemberportfolio/controllers/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service controllers package -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# diff --git a/debianmemberportfolio/controllers/error.py b/debianmemberportfolio/controllers/error.py deleted file mode 100644 index 4047bb5..0000000 --- a/debianmemberportfolio/controllers/error.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service ErrorController -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -import cgi - -from paste.urlparser import PkgResourcesParser -from pylons import request -from pylons.controllers.util import forward -from pylons.middleware import error_document_template -from webhelpers.html.builder import literal - -from debianmemberportfolio.lib.base import BaseController - - -class ErrorController(BaseController): - """Generates error documents as and when they are required. - - The ErrorDocuments middleware forwards to ErrorController when error - related status codes are returned from the application. - - This behaviour can be altered by changing the parameters to the - ErrorDocuments middleware in your config/middleware.py file. - """ - - def document(self): - """Render the error document""" - resp = request.environ.get('pylons.original_response') - content = literal(resp.body) or cgi.escape( - request.GET.get('message', '')) - page = error_document_template % \ - dict(prefix=request.environ.get('SCRIPT_NAME', ''), - code=cgi.escape( - request.GET.get('code', str(resp.status_int))), - message=content) - return page - - def img(self, id): - """Serve Pylons' stock images""" - return self._serve_file('/'.join(['media/img', id])) - - def style(self, id): - """Serve Pylons' stock stylesheets""" - return self._serve_file('/'.join(['media/style', id])) - - def _serve_file(self, path): - """ - Call Paste's FileApp (a WSGI application) to serve the file at - the specified path - """ - request.environ['PATH_INFO'] = '/%s' % path - return forward(PkgResourcesParser('pylons', 'pylons')) diff --git a/debianmemberportfolio/controllers/portfolio.py b/debianmemberportfolio/controllers/portfolio.py deleted file mode 100644 index 5539edc..0000000 --- a/debianmemberportfolio/controllers/portfolio.py +++ /dev/null @@ -1,212 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service PortfolioController -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This module defines the PortfolioController class used to render the portfolio -of a person. -""" - -import logging -import simplejson - -from pylons import request, response, tmpl_context as c -from pylons.i18n import N_, _ -import formencode.api -import formencode.validators - -from debianmemberportfolio.lib.base import BaseController, render -from debianmemberportfolio.model.form import DDDataRequest, DeveloperData -from debianmemberportfolio.model.urlbuilder import build_urls -from debianmemberportfolio.model import dddatabuilder - -log = logging.getLogger(__name__) - - -class PortfolioController(BaseController): - """ - Main controller for the Debian Member Portfolio Service. - """ - #: This dictionary defines groups of labeled portfolio items. - _LABELS = { - 'overview': { - 'label': N_('Overview'), - '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 -(note: co-maintainers not listed, see \ -#430986)'''), - 'reported': N_('bugs reported'), - 'usertags': N_('user tags'), - 'searchall': N_('all messages (i.e., full text search for \ -developer name on all bug logs)'), - 'wnpp': N_('WNPP'), - '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'), - 'lintian': N_('lintian reports'), - 'lintianfull': N_('full lintian reports (i.e. including \ -"info"-level messages)'), - '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'), - 'dbfinger': N_('DB information via finger'), - 'db': N_('DB information via HTTP'), - 'webid': N_('FOAF profile'), - 'alioth': N_('Alioth'), - 'wiki': N_('Wiki'), - 'forum': N_('Forum'), - }, - 'miscellaneous': { - 'label': N_('Miscellaneous'), - 'debtags': N_('debtags'), - 'planetname': N_('Planet Debian (name)'), - 'planetuser': N_('Planet Debian (username)'), - 'links': N_('links'), - 'website': N_('Debian website'), - 'search': N_('Debian search'), - 'gpgfinger': N_('GPG public key via finger'), - '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_('MIA database information'), - 'groupinfo': N_('Group membership information'), - }, - 'ubuntu': { - 'label': N_('Ubuntu'), - 'ubuntudiff': N_('Available patches from Ubuntu'), - }, - } - - #: list of field name tuples for Debian Maintainers - DM_TUPLES = (('name', 'name'), - ('gpgfp', 'gpgfp'), - ('nonddemail', 'email')) - - #: list of field name tuples for Debian Developers - DD_TUPLES = (('username', 'username'), - ('aliothusername', 'username')) - - def _get_label(self, section, url=None): - if section in self._LABELS: - if url: - if url in self._LABELS[section]: - return self._LABELS[section][url] - elif 'label' in self._LABELS[section]: - return self._LABELS[section]['label'] - if url: - return "%s.%s" % (section, url) - return section - - def index(self): - """ - Render the input form. - """ - return render('/showform.mako') - - def _build_request_params(self): - schema = DDDataRequest() - formencode.api.set_stdtranslation( - domain="FormEncode", - languages=[lang[0:2] for lang in request.languages]) - form_result = schema.to_python(request.params) - fields = dddatabuilder.build_data(form_result['email']) - rp = request.params.copy() - - if fields['type'] in (dddatabuilder.TYPE_DD, dddatabuilder.TYPE_DM): - for tuple in self.DM_TUPLES: - if not tuple[0] in rp or not rp[tuple[0]]: - rp[tuple[0]] = fields[tuple[1]] - if fields['type'] == dddatabuilder.TYPE_DD: - for tuple in self.DD_TUPLES: - if not tuple[0] in rp or not rp[tuple[0]]: - rp[tuple[0]] = fields[tuple[1]] - - return rp - - def urllist(self): - """Handle the actual data.""" - try: - rp = self._build_request_params() - except formencode.validators.Invalid as error: - c.messages = {'errors': error.unpack_errors()} - return render('/showform.mako') - - schema = DeveloperData() - try: - formencode.api.set_stdtranslation( - domain="FormEncode", - languages=[lang[0:2] for lang in request.languages]) - form_result = schema.to_python(rp) - except formencode.validators.Invalid, error: - c.messages = {'errors': error.unpack_errors()} - return render('/showform.mako') - if form_result['wikihomepage'] is None: - log.debug('generate wikihomepage from name') - form_result['wikihomepage'] = "".join( - [part.capitalize() for part in form_result['name'].split()]) - data = build_urls(form_result) - if form_result['mode'] == 'json': - response.headers['Content-Type'] = 'text/javascript' - return simplejson.dumps( - dict([("%s.%s" % (entry[1], entry[2].name), entry[3]) - 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))) - elif entry[0] == 'section': - entry.append(_(self._get_label(entry[1]))) - c.urldata = data - return render('/showurls.mako') diff --git a/debianmemberportfolio/controllers/showformscripts.py b/debianmemberportfolio/controllers/showformscripts.py deleted file mode 100644 index 1e906a2..0000000 --- a/debianmemberportfolio/controllers/showformscripts.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service ShowformscriptsController. -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This file defines the ShowformscriptsController used to generate the JavaScript -code in forms. -""" - -import logging -import simplejson - -from pylons import request, response -from pylons.controllers.util import abort - -import formencode.api -import formencode.validators - -from debianmemberportfolio.lib.base import BaseController, render -from debianmemberportfolio.model.form import DDDataRequest -from debianmemberportfolio.model import dddatabuilder - -log = logging.getLogger(__name__) - - -class ShowformscriptsController(BaseController): - """This controller is used to support data entry in showform. - - It provides code for generating JavaScript as well as JSON - responses for autocompletion of fields.""" - - def index(self): - """ - This action generates the helper script for the showform page. - """ - response.headers['Content-Type'] = 'text/javascript; charset=utf-8' - return render('/showformscript.mako') - - def fetchdddata(self): - """ - This action fetches the data for a given mail address and - returns them as JSON. - """ - schema = DDDataRequest() - try: - formencode.api.set_stdtranslation( - domain="FormEncode", - languages=[lang[0:2] for lang in request.languages]) - form_result = schema.to_python(request.params) - except formencode.validators.Invalid, error: - errors = error.unpack_errors() - abort(400, "\n".join( - ["%s: %s" % (key, errors[key]) for key in errors])) - fields = dddatabuilder.build_data(form_result['email']) - log.debug(fields) - response.headers['Content-Type'] = 'text/plain' - return simplejson.dumps(fields) diff --git a/debianmemberportfolio/controllers/template.py b/debianmemberportfolio/controllers/template.py deleted file mode 100644 index b1f53e1..0000000 --- a/debianmemberportfolio/controllers/template.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service TemplateController -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This file contains the TemplateController used to render templates. -""" - -from debianmemberportfolio.lib.base import BaseController -from pylons.controllers.util import abort - - -class TemplateController(BaseController): - - def view(self, url): - """By default, the final controller tried to fulfill the request - when no other routes match. It may be used to display a template - when all else fails, e.g.:: - - def view(self, url): - return render('/%s' % url) - - Or if you're using Mako and want to explicitly send a 404 (Not - Found) response code when the requested template doesn't exist:: - - import mako.exceptions - - def view(self, url): - try: - return render('/%s' % url) - except mako.exceptions.TopLevelLookupException: - abort(404) - - By default this controller aborts the request with a 404 (Not - Found) - """ - abort(404) diff --git a/debianmemberportfolio/lib/__init__.py b/debianmemberportfolio/lib/__init__.py deleted file mode 100644 index 4937320..0000000 --- a/debianmemberportfolio/lib/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service lib package -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# diff --git a/debianmemberportfolio/lib/app_globals.py b/debianmemberportfolio/lib/app_globals.py deleted file mode 100644 index cb4ea2b..0000000 --- a/debianmemberportfolio/lib/app_globals.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service application Globals -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -The application's Globals object -""" - -from beaker.cache import CacheManager -from beaker.util import parse_cache_config_options - - -class Globals(object): - """ - Globals acts as a container for objects available throughout the - life of the application - """ - - def __init__(self, config): - """ - One instance of Globals is created during application - initialization and is available during requests via the - 'app_globals' variable - """ - self.cache = CacheManager(**parse_cache_config_options(config)) diff --git a/debianmemberportfolio/lib/base.py b/debianmemberportfolio/lib/base.py deleted file mode 100644 index 7746e92..0000000 --- a/debianmemberportfolio/lib/base.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service base controller -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -The base Controller API - -Provides the BaseController class for subclassing. -""" -from pylons import tmpl_context as c, request -from pylons.controllers import WSGIController -from pylons.i18n import add_fallback -from pylons.templating import render_mako as render - - -class BaseController(WSGIController): - - def __call__(self, environ, start_response): - """Invoke the Controller""" - # WSGIController.__call__ dispatches to the Controller method - # the request is routed to. This routing information is - # available in environ['pylons.routes_dict'] - # set language environment - try: - languages = request.languages - for lang in languages: - try: - add_fallback(lang.replace('-', '_')) - except: - pass - except: - pass - c.messages = {'errors': [], 'messages': []} - return WSGIController.__call__(self, environ, start_response) - - -__all__ = ['BaseController', 'render'] diff --git a/debianmemberportfolio/lib/helpers.py b/debianmemberportfolio/lib/helpers.py deleted file mode 100644 index 9bcb5e2..0000000 --- a/debianmemberportfolio/lib/helpers.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service webhelpers -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -# pymode:lint_ignore=W0611 -# -"""Helper functions - -Consists of functions to typically be used within templates, but also -available to Controllers. This module is available to templates as 'h'. -""" -from webhelpers.html.builder import escape, literal -from webhelpers.html.tags import stylesheet_link, javascript_link, image, \ - form, text, radio, submit, end_form, link_to, checkbox -from webhelpers.text import truncate -from webhelpers.textile import textile -from pylons import url diff --git a/debianmemberportfolio/model/form.py b/debianmemberportfolio/model/form.py deleted file mode 100644 index b10ad95..0000000 --- a/debianmemberportfolio/model/form.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service form handling model -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This file contains the form definitions used in the controllers. -""" - -import formencode - - -class DeveloperData(formencode.Schema): - """Validation schema for DeveloperData.""" - allow_extra_fields = True - filter_extra_fields = True - email = formencode.validators.Email(not_empty=True) - name = formencode.validators.String(not_empty=True) - gpgfp = formencode.All(formencode.validators.PlainText(), - formencode.validators.MinLength(32), - formencode.validators.MaxLength(40)) - username = formencode.validators.PlainText() - nonddemail = formencode.validators.Email() - aliothusername = formencode.validators.PlainText() - mode = formencode.validators.OneOf([u'json', u'html'], if_missing=u'html') - forumsid = formencode.validators.Int(if_missing=None) - wikihomepage = formencode.validators.String(if_missing=None) - - -class DDDataRequest(formencode.Schema): - """Validation schema for DDData request.""" - allow_extra_fields = True - filter_extra_fields = False - email = formencode.validators.Email(not_empty=True) diff --git a/debianmemberportfolio/templates/base.mako b/debianmemberportfolio/templates/base.mako deleted file mode 100644 index 4df882f..0000000 --- a/debianmemberportfolio/templates/base.mako +++ /dev/null @@ -1,52 +0,0 @@ -## -*- coding: utf-8 -*- \ - -<%doc> -Base template for XHTML templates. -Copyright © 2009-2014 Jan Dittberner - -This file is part of the Debian Member Portfolio service. - -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 -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 License along -with this program. If not, see . - - - - ${_('Debian Member Portfolio Service')}${self.titleaddon()} - ${h.stylesheet_link(h.url('/stylesheets/style.css'))} - ${self.extrahead()} - - - -
- ${self.body()} -
- - - - - -<%def name="extrahead()"> diff --git a/debianmemberportfolio/templates/showformscript.mako b/debianmemberportfolio/templates/showformscript.mako deleted file mode 100644 index 9cac439..0000000 --- a/debianmemberportfolio/templates/showformscript.mako +++ /dev/null @@ -1,122 +0,0 @@ -## -*- coding: utf-8 -*- \ -<%doc> -Helper JavaScript for the data input form. -Copyright © 2009, 2010, 2015 Jan Dittberner - -This file is part of DDPortfolio service. - -DDPortfolio 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. - -DDPortfolio 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 -License along with this program. If not, see -. -\ - -var defaulthiddendivs = new Array( - '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', - '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); -var maskedfielddivs = new Array( - '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', - '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); -var allfielddivs = new Array( - '#namefield', '#gpgfpfield', '#usernamefield', '#nonddemailfield', - '#aliothusernamefield', '#wikihomepagefield', '#forumsidfield'); - -function updateFields(data, textStatus) { - if (data.type == 2) { // DD - $('#name').attr('value', data.name).attr('readonly', 'readonly'); - $('#gpgfp').attr('value', data.gpgfp); - $('#username').attr('value', data.username).attr( - 'readonly', 'readonly'); - $('#nonddemail').attr('value', data.email).focus(); - $('#aliothusername').attr('value', data.username); - $('#wikihomepage').attr('value', data.wikihomepage); - - $('#namefield').show(); - $('#gpgfpfield').show(); - $('#usernamefield').show(); - $('#nonddemailfield').show(); - $('#aliothusernamefield').show(); - $('#wikihomepagefield').show(); - $('#forumsidfield').show(); - - $('#nonddemail').focus().select(); - } else if (data.type == 1) { // DM - $('#name').attr('value', data.name).attr('readonly', 'readonly'); - $('#gpgfp').attr('value', data.gpgfp); - $('#username').attr('value', ''); - $('#nonddemail').attr('value', data.email).focus(); - $('#wikihomepage').attr('value', data.wikihomepage); - - $('#namefield').show(); - $('#gpgfpfield').show(); - $('#usernamefield').hide(); - $('#nonddemailfield').hide(); - $('#aliothusernamefield').show(); - $('#wikihomepagefield').show(); - $('#forumsidfield').show(); - - $('#aliothusername').focus().select(); - } else { - $('#nonddemail').attr('value', data.email); - $('#name').removeAttr('readonly'); - $('#username').removeAttr('readonly').attr('value', ''); - $('#gpgfp').attr('value', ''); - - $('#usernamefield').hide(); - $('#gpgfpfield').hide(); - $('#nonddemailfield').hide(); - $('#namefield').show(); - $('#aliothusernamefield').show(); - $('#wikihomepagefield').show(); - $('#forumsidfield').show(); - - $('#name').focus().select(); - } -} - -function onChangeShowAll(event) { - if ($('#showall').prop('checked')) { - for (var fielddiv in allfielddivs) { - $(allfielddivs[fielddiv]).show(); - } - } else { - for (var fielddiv in maskedfielddivs) { - $(maskedfielddivs[fielddiv]).hide(); - } - } -} - -function onBlurEmail() { - if ($.trim($('#email').prop('value')).length > 0) { - $.ajax({ - 'url' : '${h.url(controller="showformscripts", action="fetchdddata")}', - 'data' : {'email' : $('#email').prop('value')}, - 'dataType' : 'json', - 'success' : updateFields, - 'error' : function(request, textStatus, errorThrown) { - $('#email').focus(); - } - }); - } -} - -$(document).ready(function() { - for (var index in defaulthiddendivs) { - if (!$(defaulthiddendivs[index]).hasClass('witherrors')) { - $(defaulthiddendivs[index]).hide(); - } - } - - $('#showall').attr('checked', false).change(onChangeShowAll); - $('#showallfield').show(); - $('#email').blur(onBlurEmail).focus(); -}); diff --git a/debianmemberportfolio/templates/showurls.mako b/debianmemberportfolio/templates/showurls.mako deleted file mode 100644 index 65358fd..0000000 --- a/debianmemberportfolio/templates/showurls.mako +++ /dev/null @@ -1,67 +0,0 @@ -## -*- coding: utf-8 -*- -<%inherit file="base.mako" />\ -<%doc> -Template for the url output page. -Copyright © 2009-2014 Jan Dittberner - -This file is part of Debian Member Portfolio Service. - -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 -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 License along -with this program. If not, see . -\ -<%def name="titleaddon()"> - - ${_('Your personal links')} - -% if c.urldata: -
- ${_('Debian Member Portfolio')} - - - - - - % for row in c.urldata: - % if row[0] == 'section': - - <% urlclass = 'odd' %> - % elif row[0] == 'error': - - - - - % else: - - - - - <% - if urlclass == 'odd': - urlclass = 'even' - else: - urlclass = 'odd' - %> - % endif - % endfor - -
${_('Usage')}${_('URL')}
${row[2]}
${h.literal(h.textile(row[4]))}${_('Error during URL creation:')} - ${row[3].replace("\n", - '
')}
${h.literal(h.textile(row[4]))} - % if row[2].type == 'url': - ${h.link_to(h.truncate(row[3], length=120), row[3])} - % else: - ${row[3]} - % endif -
-
-% endif -

${h.link_to(_('Restart'), h.url(controller='portfolio', action='index'))}

diff --git a/debianmemberportfolio/tests/__init__.py b/debianmemberportfolio/tests/__init__.py deleted file mode 100644 index 31fbc54..0000000 --- a/debianmemberportfolio/tests/__init__.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service tests package -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -Pylons application test package - -When the test runner finds and executes tests within this directory, this file -will be loaded to setup the test environment. - -It registers the root directory of the project in sys.path and pkg_resources, -in case the project hasn't been installed with setuptools. It also initializes -the application via websetup (paster setup-app) with the project's test.ini -configuration file. -""" - -from unittest import TestCase - -from paste.script.appinstall import SetupCommand -from pylons import url -from routes.util import URLGenerator -from webtest import TestApp - -import pylons.test - -__all__ = ['environ', 'url', 'TestController'] - -# Invoke websetup with the current config file -SetupCommand('setup-app').run([pylons.test.pylonsapp.config['__file__']]) - -environ = {} - - -class TestController(TestCase): - - def __init__(self, *args, **kwargs): - wsgiapp = pylons.test.pylonsapp - config = wsgiapp.config - self.app = TestApp(wsgiapp) - url._push_object(URLGenerator(config['routes.map'], environ)) - TestCase.__init__(self, *args, **kwargs) diff --git a/debianmemberportfolio/tests/functional/__init__.py b/debianmemberportfolio/tests/functional/__init__.py deleted file mode 100644 index 75697f6..0000000 --- a/debianmemberportfolio/tests/functional/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service functional tests package -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# diff --git a/debianmemberportfolio/tests/functional/test_portfolio.py b/debianmemberportfolio/tests/functional/test_portfolio.py deleted file mode 100644 index bebdbc8..0000000 --- a/debianmemberportfolio/tests/functional/test_portfolio.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service PortfolioController test -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This module defines test cases for the PortfolioController. -""" - -from debianmemberportfolio.tests import TestController, url - - -class TestPortfolioController(TestController): - """ - Test cases for PortfolioController. - """ - - def test_index(self): - """ - Test for the controller's index action. - """ - response = self.app.get(url(controller='portfolio', action='index')) - # Test response... - assert response.status_int == 200 - assert response.content_type == "text/html" - assert "Debian Member Portfolio Service" in response diff --git a/debianmemberportfolio/tests/functional/test_showformscripts.py b/debianmemberportfolio/tests/functional/test_showformscripts.py deleted file mode 100644 index d3da82a..0000000 --- a/debianmemberportfolio/tests/functional/test_showformscripts.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service ShowformscriptsController test -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# -""" -This module defines test cases for the ShowformscriptsController. -""" - -from debianmemberportfolio.tests import TestController, url - - -class TestShowformscriptsController(TestController): - """ - Test cases for ShowformscriptsController. - """ - - def test_index(self): - """ - Test for the controller's index action. - """ - response = self.app.get( - url(controller='showformscripts', action='index')) - # Test response... - assert response.status_int == 200 - assert response.content_type == "text/javascript" - assert "function updateField" in response diff --git a/debianmemberportfolio/tests/test_models.py b/debianmemberportfolio/tests/test_models.py deleted file mode 100644 index 6d9b913..0000000 --- a/debianmemberportfolio/tests/test_models.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- python -*- -# -*- coding: utf-8 -*- -# -# Debian Member Portfolio Service model tests -# -# Copyright © 2009-2014 Jan Dittberner -# -# This file is part of the Debian Member Portfolio Service. -# -# 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 -# 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 License -# along with this program. If not, see . -# diff --git a/development.ini b/development.ini deleted file mode 100644 index db8dcc7..0000000 --- a/development.ini +++ /dev/null @@ -1,73 +0,0 @@ -# -# Debian Member Portfolio Service - Pylons development environment -# configuration -# -# The %(here)s variable will be replaced with the parent directory of this file -# -[DEFAULT] -debug = true -# Uncomment and replace with the address which should receive any error reports -#email_to = you@yourdomain.com -smtp_server = localhost -error_email_from = paste@localhost - -[server:main] -use = egg:Paste#http -host = 127.0.0.1 -port = 5000 - -[app:main] -use = egg:debianmemberportfolio -full_stack = true -static_files = true - -cache_dir = %(here)s/data -beaker.session.key = debianmemberportfolio -beaker.session.secret = somesecret - -# If you'd like to fine-tune the individual locations of the cache data dirs -# for the Cache data, or the Session saves, un-comment the desired settings -# here: -#beaker.cache.data_dir = %(here)s/data/cache -#beaker.session.data_dir = %(here)s/data/sessions - -# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* -# Debug mode will enable the interactive debugging tool, allowing ANYONE to -# execute malicious code after an exception is raised. -#set debug = false - - -# Logging configuration -[loggers] -keys = root, routes, debianmemberportfolio - -[handlers] -keys = console - -[formatters] -keys = generic - -[logger_root] -level = INFO -handlers = console - -[logger_routes] -level = INFO -handlers = -qualname = routes.middleware -# "level = DEBUG" logs the route matched and routing variables. - -[logger_debianmemberportfolio] -level = DEBUG -handlers = -qualname = debianmemberportfolio - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -[formatter_generic] -format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] [%(threadName)s] %(message)s -datefmt = %H:%M:%S diff --git a/jessiereq.pip b/jessiereq.pip deleted file mode 100644 index ecb99be..0000000 --- a/jessiereq.pip +++ /dev/null @@ -1,29 +0,0 @@ -Flask==0.10.1 -Jinja2==2.7.3 -MarkupSafe==0.23 -Werkzeug==0.9.6 -itsdangerous==0.24 -Babel==1.3 -Flask-Babel==0.9 -pytz==2012c -speaklater==1.3 -Flask-WTF==0.10.2 -WTForms==2.0.1 -#Babel==1.3 -#Beaker==1.6.4 -#FormEncode==1.2.6 -#Mako==1.0.0 -#MarkupSafe==0.23 -#Paste==1.7.5.1 -#PasteDeploy==1.5.2 -#PasteScript==1.7.5 -#Pygments==2.0.1 -#Pylons==1.0.1 -#Routes==2.0 -#Tempita==0.5.2 -#WebError==0.10.3 -#WebHelpers==1.3 -#WebOb==1.4 -#WebTest==2.0.16 -#nose==1.3.4 -#simplejson==3.6.5 diff --git a/test.ini b/test.ini deleted file mode 100644 index bbef5d2..0000000 --- a/test.ini +++ /dev/null @@ -1,21 +0,0 @@ -# -# Debian Member Portfolio Service - Pylons testing environment configuration -# -# The %(here)s variable will be replaced with the parent directory of this file -# -[DEFAULT] -debug = true -# Uncomment and replace with the address which should receive any error reports -#email_to = you@yourdomain.com -smtp_server = localhost -error_email_from = paste@localhost - -[server:main] -use = egg:Paste#http -host = 127.0.0.1 -port = 5000 - -[app:main] -use = config:development.ini - -# Add additional test specific configuration options as necessary. From 0df84e586f9c8d5de324285f7f73b03f9ee7e040 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 12 Nov 2015 22:19:24 +0100 Subject: [PATCH 21/22] Update meta information and documentation --- ChangeLog | 3 ++ MANIFEST.in | 3 +- config.py | 21 +++++++++ debianmemberportfolio/views.py | 2 +- docs/source/devdocs.rst | 83 ++++++++++++++-------------------- docs/source/sourcecode.rst | 60 +++--------------------- run.py | 24 +++++++++- setup.cfg | 19 ++++---- setup.py | 9 ++-- stretch.pip | 2 +- 10 files changed, 105 insertions(+), 121 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838d2f7..675dbfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2015-11-12 Jan Dittberner + * port to Python 3 and Flask + 2015-03-09 Jan Dittberner * apply patch for DMD link by Paul Wise diff --git a/MANIFEST.in b/MANIFEST.in index 8b85d82..5df1764 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,2 @@ -include debianmemberportfolio/config/deployment.ini_tmpl -recursive-include debianmemberportfolio/public * +recursive-include debianmemberportfolio/static * recursive-include debianmemberportfolio/templates * diff --git a/config.py b/config.py index 4345151..a77f89b 100644 --- a/config.py +++ b/config.py @@ -1,4 +1,25 @@ +# -*- python -*- # -*- coding: utf-8 -*- +# +# Debian Member Portfolio Service Flask configuration +# +# Copyright © 2015 Jan Dittberner +# +# This file is part of the Debian Member Portfolio Service. +# +# 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 +# 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 License +# along with this program. If not, see . +# WTF_CSRF_ENABLED = False diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py index 70455db..338ba2f 100644 --- a/debianmemberportfolio/views.py +++ b/debianmemberportfolio/views.py @@ -25,7 +25,7 @@ import logging from debianmemberportfolio import app, babel from flask import g, make_response, request, render_template, abort -from flask.ext.babel import gettext as _, lazy_gettext as N_ +from flask.ext.babel import lazy_gettext as N_ from config import LANGUAGES from .forms import DeveloperData, DeveloperDataRequest from .model import dddatabuilder diff --git a/docs/source/devdocs.rst b/docs/source/devdocs.rst index 73b0626..8e03b5c 100644 --- a/docs/source/devdocs.rst +++ b/docs/source/devdocs.rst @@ -1,16 +1,15 @@ Development of Debian Member Portfolio Service ============================================== -The Debian Member Portfolio Service is implemented in `Python -`_ using the `Pylons -`_ web application -framework. +The Debian Member Portfolio Service is implemented in `Python 3 +`_ using the `Flask `_ web +application framework. The following sections describe how to setup a local development environment for the Debian Member Portfolio Service. All instructions assume that you work on a Debian system. You should use Python -2.7 for development. +3 for development. Setup of a local development ---------------------------- @@ -22,53 +21,48 @@ To start working on the source code you need to have `git`_ installed:: .. _git: http://www.git-scm.com/ The canonical git repository for the Debian Member Portfolio Service is -available at http://debianstuff.dittberner.info/git/debianmemberportfolio.git. +available at https://debianstuff.dittberner.info/git/debianmemberportfolio.git. To get a clone of the source code you change to a directory of your choice and invoke git clone:: cd ~/src - git clone http://debianstuff.dittberner.info/git/debianmemberportfolio.git + git clone https://debianstuff.dittberner.info/git/debianmemberportfolio.git -You should use `virtualenv`_ to separate the development environment from your +You should use `venv`_ to separate the development environment from your system wide Python installation. You can install virtualenv using:: - sudo aptitude install python-virtualenv + sudo aptitude install python3-venv -.. _virtualenv: https://pypi.python.org/pypi/virtualenv +.. _venv: https://docs.python.org/3/library/venv.html -When you have :command:`virtualenv` installed you should create a virtual +When you have :command:`pyvenv` installed you should create a virtual environment for Debian Member Portfolio Service development and install the requirements using `pip `_:: mkdir ~/.virtualenvs - virtualenv --distribute ~/.virtualenvs/dmportfolio + pyvenv ~/.virtualenvs/dmportfolio . ~/.virtualenvs/dmportfolio/bin/activate cd ~/src/debianmemberportfolio - pip install -r jessiereq.pip + pip install -r stretchreq.pip .. note:: The Debian Member Portfolio Service instance at http://portfolio.debian.net/ - is running on a Debian Jessie server, therefore :file:`jessiereq.pip` + is running on a Debian Stretch server, therefore :file:`stretchreq.pip` contains dependency versions matching that Debian release. The dependency download and installation into the virtual environment takes some time. -After you have your virtual environment ready you need to setup the project for -development:: - - python setup.py develop - Debian Member Portfolio Service needs the JQuery JavaScript library to function properly. The JQuery library is not included in the git clone and must be copied into the subdirectory -:file:`debianmemberportfolio/public/javascript/jquery`. On Debian systems you +:file:`debianmemberportfolio/static/javascript/jquery`. On Debian systems you can install the package libjs-jquery and place a symlink to the directory -:file:`/usr/share/javascript` into :file:`debianmemberportfolio/public`: :: +:file:`/usr/share/javascript` into :file:`debianmemberportfolio/static`: :: sudo aptitude install libjs-jquery - ln -s /usr/share/javascript debianmemberportfolio/public + ln -s /usr/share/javascript debianmemberportfolio/static Prepare for first startup ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -93,21 +87,19 @@ When you have both installed you can run:: The first synchronizes the keyrings in :file:`$HOME/debian/keyring.debian.org` with files on the `keyring.debian.org `_ host. And the second generates a key/value database in -:file:`debianmemberportfolio/model/keyringcache` that is used by the code. +:file:`debianmemberportfolio/model/keyringcache.db` that is used by the code. Run a development server ~~~~~~~~~~~~~~~~~~~~~~~~ -Pylons uses PasteScript to run a development server. You can run a development -server using:: +You can run a development server using:: - paster serve --reload development.ini + python3 run.py The output of this command should look like the following:: - Starting subprocess with file monitor - Starting server in PID 31377. - serving on http://127.0.0.1:5000 + * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit) + * Restarting with stat You can now access your development server at the URL that is printed by the command. @@ -122,21 +114,17 @@ Add new URL Debian Member Portfolio Service uses a ini style configuration file :file:`debianmemberportfolio/model/portfolio.ini` to configure the generated URL patterns. The actual URL generation is done in -:py:class:`~debianmemberportfolio.controllers.portfolio.DdportfolioController` -in the -:py:meth:`~debianmemberportfolio.controllers.portfolio.DdportfolioController.urllist` -method. +:py:func:`~debianmemberportfolio.views.urllist`. If you want to add a new URL type you have to add a line in -:file:`portfolio.ini` and an entry in -:py:class:`~debianmemberportfolio.controllers.portfolio.DdportfolioController`'s -:py:attr:`~debianmemberportfolio.controllers.portfolio.DdportfolioController._LABELS` -dictionary. The top level dictionary keys correspond to sections in the ini -file. The dictionary values are dictionaries themselves that contain a special -key ``label`` that defines the label of the section in the output and keys for -each entry to be rendered in that section. The values in these sub-dictionaries -are strings marked for translation using the :py:func:`~pylons.i18n._` function from -:py:mod:`pylons.i18n`. +:file:`portfolio.ini` and an entry in :py:mod:`~debianmemberportfolio.views`'s +:py:attr:`~debianmemberportfolio.views._LABELS` dictionary. The top level +dictionary keys correspond to sections in the ini file. The dictionary values +are dictionaries themselves that contain a special key ``label`` that defines +the label of the section in the output and keys for each entry to be rendered +in that section. The values in these sub-dictionaries are strings marked for +translation using the :py:func:`~flask.ext.babel.lazy_gettext` function from +:py:mod:`flask.ext.babel`. The patterns in :file:`portfolio.ini` can contain the following placeholders that are filled at runtime: @@ -148,7 +136,7 @@ Placeholder Replacement %(email)s email address (URL encoded) %(emailnoq)s email address %(firstchar)s first character of the email address -%(forumsid)d forum user id +%(forumsid)s forum user id %(gpgfp)s GNUPG/PGP key fingerprint %(name)s full name (i.e. John Smith) %(username)s Debian user name @@ -158,10 +146,9 @@ Placeholder Replacement .. _alioth.debian.org: https://alioth.debian.org/ The replacement of placeholders is performed in the -:py:meth:`~debianmemberportfolio.controllers.portfolio.DdportfolioController.urllist` -method. And uses data from the Debian keyring. Access to the pre-parsed keyring -data is performed using the -:py:func:`~debianmemberportfolio.model.dddatabuilder.build_data` function of -the module :py:mod:`debianmemberportfolio.model.dddatabuilder`, which uses +:py:func:`~debianmemberportfolio.views.urllist` function. And uses data from +the Debian keyring. Access to the pre-parsed keyring data is performed using +the :py:func:`~debianmemberportfolio.model.dddatabuilder.build_data` function +of the module :py:mod:`debianmemberportfolio.model.dddatabuilder`, which uses several helper functions from :py:mod:`debianmemberportfolio.model.keyfinder` to access the key information. diff --git a/docs/source/sourcecode.rst b/docs/source/sourcecode.rst index 0755a34..1c5dd88 100644 --- a/docs/source/sourcecode.rst +++ b/docs/source/sourcecode.rst @@ -4,58 +4,16 @@ Source documentation The sections below contain mostly autogenerated documentation of the source code of the Debian Member Portfolio Service. -Controllers ------------ +Forms +----- -.. automodule:: debianmemberportfolio.controllers +.. automodule:: debianmemberportfolio.forms :members: -portfolio controller -~~~~~~~~~~~~~~~~~~~~ +Views +----- -.. automodule:: debianmemberportfolio.controllers.portfolio - :members: - -error controller -~~~~~~~~~~~~~~~~ - -.. automodule:: debianmemberportfolio.controllers.error - :members: - -showformscripts controller -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. automodule:: debianmemberportfolio.controllers.showformscripts - :members: - -template controller -~~~~~~~~~~~~~~~~~~~ - -.. automodule:: debianmemberportfolio.controllers.template - :members: - -Library code ------------- - -.. automodule:: debianmemberportfolio.lib - :members: - -app_globals -~~~~~~~~~~~ - -.. automodule:: debianmemberportfolio.lib.app_globals - :members: - -base -~~~~ - -.. automodule:: debianmemberportfolio.lib.base - :members: - -helpers -~~~~~~~ - -.. automodule:: debianmemberportfolio.lib.helpers +.. automodule:: debianmemberportfolio.views :members: Model @@ -70,12 +28,6 @@ dddatabuilder .. automodule:: debianmemberportfolio.model.dddatabuilder :members: -form -~~~~ - -.. automodule:: debianmemberportfolio.model.form - :members: - keyfinder ~~~~~~~~~ diff --git a/run.py b/run.py index 715fe63..c42503f 100755 --- a/run.py +++ b/run.py @@ -1,4 +1,26 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 +# -*- python -*- +# -*- coding: utf-8 -*- +# +# Debian Member Portfolio Service Flask runner +# +# Copyright © 2015 Jan Dittberner +# +# This file is part of the Debian Member Portfolio Service. +# +# 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 +# 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 License +# along with this program. If not, see . +# from debianmemberportfolio import app if __name__ == '__main__': diff --git a/setup.cfg b/setup.cfg index da36c32..00c4a19 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,29 +12,28 @@ doc-dir=docs/html make-dirs=1 [nosetests] -with-pylons = test.ini cover-package = debianmemberportfolio # Babel configuration [compile_catalog] -domain = debianmemberportfolio -directory = debianmemberportfolio/i18n +domain = messages +directory = debianmemberportfolio/translations statistics = true [extract_messages] charset = UTF-8 add_comments = TRANSLATORS: -output_file = debianmemberportfolio/i18n/debianmemberportfolio.pot +output_file = messages.pot width = 80 msgid_bugs_address = jan@dittberner.info [init_catalog] -domain = debianmemberportfolio -input_file = debianmemberportfolio/i18n/debianmemberportfolio.pot -output_dir = debianmemberportfolio/i18n +domain = messages +input_file = messages.pot +output_dir = debianmemberportfolio/translations [update_catalog] -domain = debianmemberportfolio -input_file = debianmemberportfolio/i18n/debianmemberportfolio.pot -output_dir = debianmemberportfolio/i18n +domain = messages +input_file = messages.pot +output_dir = debianmemberportfolio/translations previous = true diff --git a/setup.py b/setup.py index cfe9852..2a40f15 100644 --- a/setup.py +++ b/setup.py @@ -46,15 +46,16 @@ setup( author_email='jan@dittberner.info', url='http://debian-stuff.dittberner.info/debianmemberportfolio', license='AGPL-3.0+', - install_requires=["Flask>=0.10.1", 'babel>=0.9.6'], + install_requires=["Flask>=0.10.1", 'Babel>=1.3', 'Flask-Babel>=0.9'], packages=find_packages(exclude=['ez_setup']), include_package_data=True, test_suite='nose.collector', package_data={'debianmemberportfolio': - ['*.ini', 'i18n/*/LC_MESSAGES/*.mo']}, + ['*.ini', 'translations/*/LC_MESSAGES/*.mo']}, message_extractors={'debianmemberportfolio': [ ('**.py', 'python', None), - ('templates/**.mako', 'mako', None), - ('public/**', 'ignore', None)]}, + ('templates/**.html', 'jinja2', None), + ('templates/**.js', 'jinja2', None), + ('static/**', 'ignore', None)]}, zip_safe=False, ) diff --git a/stretch.pip b/stretch.pip index f8ad1c2..439ca0e 100644 --- a/stretch.pip +++ b/stretch.pip @@ -3,7 +3,7 @@ Jinja2==2.8 MarkupSafe==0.23 Werkzeug==0.10.4 itsdangerous==0.24 -Babel==1.3 +Babel==2.1.1 Flask-Babel==0.9 pytz==2012c speaklater==1.3 From 7adc53c31ec76a8fb1c18757e1713ee2d67e00a6 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 12 Nov 2015 22:20:15 +0100 Subject: [PATCH 22/22] Update german translation --- .../translations/de/LC_MESSAGES/messages.po | 290 +++++++++++------- 1 file changed, 181 insertions(+), 109 deletions(-) diff --git a/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po b/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po index 71f4b27..8eed91f 100644 --- a/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po +++ b/debianmemberportfolio/translations/de/LC_MESSAGES/messages.po @@ -9,25 +9,34 @@ msgid "" msgstr "" "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" -"POT-Creation-Date: 2014-02-08 18:14+0100\n" -"PO-Revision-Date: 2014-02-08 18:03+0100\n" +"POT-Creation-Date: 2015-11-12 22:11+0100\n" +"PO-Revision-Date: 2015-11-12 22:14+0100\n" "Last-Translator: Jan Dittberner \n" +"Language: de\n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 2.1.1\n" -#: debianmemberportfolio/controllers/portfolio.py:45 +#: debianmemberportfolio/forms.py:33 +msgid "JSON" +msgstr "JSON" + +#: debianmemberportfolio/forms.py:33 +msgid "HTML" +msgstr "HTML" + +#: debianmemberportfolio/views.py:39 msgid "Overview" msgstr "Überblick" -#: debianmemberportfolio/controllers/portfolio.py:46 +#: debianmemberportfolio/views.py:40 msgid "Debian Member's Package Overview" msgstr "Paketübersicht des Debian-Mitglieds" -#: debianmemberportfolio/controllers/portfolio.py:47 +#: debianmemberportfolio/views.py:41 msgid "" "Debian Member's Package Overview\n" "... showing all email addresses" @@ -35,11 +44,11 @@ msgstr "" "Paketübersicht des Debian-Mitglieds\n" "... mit allen E-Mailadressen" -#: debianmemberportfolio/controllers/portfolio.py:51 +#: debianmemberportfolio/views.py:45 msgid "Bugs" msgstr "Fehler" -#: debianmemberportfolio/controllers/portfolio.py:52 +#: debianmemberportfolio/views.py:46 msgid "" "bugs received\n" "(note: co-maintainers not listed, see #430986)" -#: debianmemberportfolio/controllers/portfolio.py:56 +#: debianmemberportfolio/views.py:50 msgid "bugs reported" msgstr "Berichtete Fehler" -#: debianmemberportfolio/controllers/portfolio.py:57 +#: debianmemberportfolio/views.py:51 msgid "user tags" msgstr "User Tags" -#: debianmemberportfolio/controllers/portfolio.py:58 +#: debianmemberportfolio/views.py:52 msgid "all messages (i.e., full text search for developer name on all bug logs)" msgstr "" "Alle Nachrichten (d.h. Volltextsuche nach dem Entwicklernamen in allen " "Fehlerlogs)" -#: debianmemberportfolio/controllers/portfolio.py:60 +#: debianmemberportfolio/views.py:54 msgid "WNPP" msgstr "WNPP" -#: debianmemberportfolio/controllers/portfolio.py:61 +#: debianmemberportfolio/views.py:55 msgid "correspondent for bugs" msgstr "Beitragender zu Fehlern" -#: debianmemberportfolio/controllers/portfolio.py:62 +#: debianmemberportfolio/views.py:56 msgid "one year open bug history graph" msgstr "Graph der Entwicklung offener Fehlerberichte über ein Jahr" -#: debianmemberportfolio/controllers/portfolio.py:65 +#: debianmemberportfolio/views.py:59 msgid "Build" msgstr "Build" -#: debianmemberportfolio/controllers/portfolio.py:66 +#: debianmemberportfolio/views.py:60 msgid "buildd.d.o" msgstr "buildd.d.o" -#: debianmemberportfolio/controllers/portfolio.py:67 +#: debianmemberportfolio/views.py:61 msgid "igloo" msgstr "Igloo" -#: debianmemberportfolio/controllers/portfolio.py:70 +#: debianmemberportfolio/views.py:64 msgid "Quality Assurance" msgstr "Qualitätssicherung" -#: debianmemberportfolio/controllers/portfolio.py:71 +#: debianmemberportfolio/views.py:65 msgid "maintainer dashboard" msgstr "Maintainer Dashboard" -#: debianmemberportfolio/controllers/portfolio.py:72 +#: debianmemberportfolio/views.py:66 msgid "lintian reports" msgstr "Lintian-Berichte" -#: debianmemberportfolio/controllers/portfolio.py:73 +#: debianmemberportfolio/views.py:67 msgid "full lintian reports (i.e. including \"info\"-level messages)" msgstr "" "vollständige Lintian-Berichte (d.h. inklusive Meldungen der Stufe " "\"info\")" -#: debianmemberportfolio/controllers/portfolio.py:75 +#: debianmemberportfolio/views.py:69 msgid "piuparts" msgstr "piuparts" -#: debianmemberportfolio/controllers/portfolio.py:76 +#: debianmemberportfolio/views.py:70 msgid "Debian patch tracking system" msgstr "Debian Nachverfolgungssystem für Patches" -#: debianmemberportfolio/controllers/portfolio.py:77 +#: debianmemberportfolio/views.py:71 msgid "Debian Url ChecKer" msgstr "Debian URL-Prüfer" -#: debianmemberportfolio/controllers/portfolio.py:80 +#: debianmemberportfolio/views.py:74 msgid "Mailing Lists" msgstr "Mailinglisten" -#: debianmemberportfolio/controllers/portfolio.py:81 +#: debianmemberportfolio/views.py:75 msgid "lists.d.o" msgstr "lists.d.o" -#: debianmemberportfolio/controllers/portfolio.py:82 +#: debianmemberportfolio/views.py:76 msgid "lists.a.d.o" msgstr "lists.a.d.o" -#: debianmemberportfolio/controllers/portfolio.py:83 +#: debianmemberportfolio/views.py:77 msgid "gmane" msgstr "Gmane" -#: debianmemberportfolio/controllers/portfolio.py:86 +#: debianmemberportfolio/views.py:80 msgid "Files" msgstr "Dateien" -#: debianmemberportfolio/controllers/portfolio.py:87 +#: debianmemberportfolio/views.py:81 msgid "people.d.o" msgstr "people.d.o" -#: debianmemberportfolio/controllers/portfolio.py:88 +#: debianmemberportfolio/views.py:82 msgid "oldpeople" msgstr "oldpeople" -#: debianmemberportfolio/controllers/portfolio.py:89 -#: debianmemberportfolio/controllers/portfolio.py:97 +#: debianmemberportfolio/views.py:83 debianmemberportfolio/views.py:91 msgid "Alioth" msgstr "Alioth" -#: debianmemberportfolio/controllers/portfolio.py:92 +#: debianmemberportfolio/views.py:86 msgid "Membership" msgstr "Mitgliedschaft" -#: debianmemberportfolio/controllers/portfolio.py:93 +#: debianmemberportfolio/views.py:87 msgid "NM" msgstr "NM" -#: debianmemberportfolio/controllers/portfolio.py:94 +#: debianmemberportfolio/views.py:88 msgid "DB information via finger" msgstr "DB-Informationen per finger" -#: debianmemberportfolio/controllers/portfolio.py:95 +#: debianmemberportfolio/views.py:89 msgid "DB information via HTTP" msgstr "DB-Informationen per HTTP" -#: debianmemberportfolio/controllers/portfolio.py:96 +#: debianmemberportfolio/views.py:90 msgid "FOAF profile" msgstr "FOAF-Profil" -#: debianmemberportfolio/controllers/portfolio.py:98 +#: debianmemberportfolio/views.py:92 msgid "Wiki" msgstr "Wiki" -#: debianmemberportfolio/controllers/portfolio.py:99 +#: debianmemberportfolio/views.py:93 msgid "Forum" msgstr "Forum" -#: debianmemberportfolio/controllers/portfolio.py:102 +#: debianmemberportfolio/views.py:96 msgid "Miscellaneous" msgstr "Sonstiges" -#: debianmemberportfolio/controllers/portfolio.py:103 +#: debianmemberportfolio/views.py:97 msgid "debtags" msgstr "debtags" -#: debianmemberportfolio/controllers/portfolio.py:104 +#: debianmemberportfolio/views.py:98 msgid "Planet Debian (name)" msgstr "Planet Debian (Name)" -#: debianmemberportfolio/controllers/portfolio.py:105 +#: debianmemberportfolio/views.py:99 msgid "Planet Debian (username)" msgstr "Planet Debian (Benutzername)" -#: debianmemberportfolio/controllers/portfolio.py:106 +#: debianmemberportfolio/views.py:100 msgid "links" msgstr "Links" -#: debianmemberportfolio/controllers/portfolio.py:107 +#: debianmemberportfolio/views.py:101 msgid "Debian website" msgstr "Debian Webseite" -#: debianmemberportfolio/controllers/portfolio.py:108 +#: debianmemberportfolio/views.py:102 msgid "Debian search" msgstr "Debian-Suche" -#: debianmemberportfolio/controllers/portfolio.py:109 +#: debianmemberportfolio/views.py:103 msgid "GPG public key via finger" msgstr "öffentlicher GPG-Schlüssel per finger" -#: debianmemberportfolio/controllers/portfolio.py:110 +#: debianmemberportfolio/views.py:104 msgid "GPG public key via HTTP" msgstr "öffentlicher GPG-Schlüssel per HTTP" -#: debianmemberportfolio/controllers/portfolio.py:111 +#: debianmemberportfolio/views.py:105 msgid "NM, AM participation" msgstr "NM-, AM-Mitwirkung" -#: debianmemberportfolio/controllers/portfolio.py:112 +#: debianmemberportfolio/views.py:106 msgid "Contribution information" msgstr "Debian Contributor-Informationen" -#: debianmemberportfolio/controllers/portfolio.py:115 +#: debianmemberportfolio/views.py:109 msgid "Information reachable via ssh (for Debian Members)" msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)" -#: debianmemberportfolio/controllers/portfolio.py:116 +#: debianmemberportfolio/views.py:110 msgid "owned debian.net domains" msgstr "Besitz von debian.net-Domains" -#: debianmemberportfolio/controllers/portfolio.py:117 +#: debianmemberportfolio/views.py:111 msgid "" -"MIA database" -" information" +"MIA " +"database information" msgstr "" "Informationen in der MIA-Datenbank" -#: debianmemberportfolio/controllers/portfolio.py:119 +#: debianmemberportfolio/views.py:113 msgid "Group membership information" msgstr "Information über Gruppenmitgliedschaften" -#: debianmemberportfolio/controllers/portfolio.py:122 +#: debianmemberportfolio/views.py:116 msgid "Ubuntu" msgstr "Ubuntu" -#: debianmemberportfolio/controllers/portfolio.py:123 +#: debianmemberportfolio/views.py:117 msgid "Available patches from Ubuntu" msgstr "Verfügbare Patches aus Ubuntu" -#: debianmemberportfolio/model/urlbuilder.py:40 +#: debianmemberportfolio/model/urlbuilder.py:43 msgid "Email address" msgstr "E-Mailadresse" -#: debianmemberportfolio/model/urlbuilder.py:41 +#: debianmemberportfolio/model/urlbuilder.py:44 msgid "Name" msgstr "Name" -#: debianmemberportfolio/model/urlbuilder.py:42 +#: debianmemberportfolio/model/urlbuilder.py:45 msgid "GPG fingerprint" msgstr "GPG-Fingerabdruck" -#: debianmemberportfolio/model/urlbuilder.py:43 +#: debianmemberportfolio/model/urlbuilder.py:46 msgid "Debian user name" msgstr "Debian-Benutzername" -#: debianmemberportfolio/model/urlbuilder.py:44 +#: debianmemberportfolio/model/urlbuilder.py:47 msgid "Non Debian email address" msgstr "Nicht-Debian-E-Mailadresse" -#: debianmemberportfolio/model/urlbuilder.py:45 +#: debianmemberportfolio/model/urlbuilder.py:48 msgid "Alioth user name" msgstr "Alioth-Benutzername" -#: debianmemberportfolio/model/urlbuilder.py:97 -#: debianmemberportfolio/model/urlbuilder.py:101 +#: debianmemberportfolio/model/urlbuilder.py:109 +#: debianmemberportfolio/model/urlbuilder.py:113 #, python-format msgid "Missing input: %s" msgstr "Fehlende Eingabe: %s" -#: debianmemberportfolio/templates/base.mako:25 -#: debianmemberportfolio/templates/base.mako:33 +#: debianmemberportfolio/templates/base.html:24 +#: debianmemberportfolio/templates/base.html:31 msgid "Debian Member Portfolio Service" msgstr "Debian-Mitglieder-Portfolioservice" -#: debianmemberportfolio/templates/base.mako:31 +#: debianmemberportfolio/templates/base.html:30 msgid "Debian Logo" msgstr "Debian-Logo" -#: debianmemberportfolio/templates/base.mako:34 +#: debianmemberportfolio/templates/base.html:32 msgid "" "This service has been inspired by Stefano Zacchiroli's DDPortfolio page in the " @@ -298,22 +306,22 @@ msgid "" "Debian Member's or package maintainer's information regarding Debian." msgstr "" "Dieser Dienst wurde durch Stefano Zacchirolis DDPortfolio-Seite im Debian " +"href=\"http://wiki.debian.org/DDPortfolio\">DDPortfolio-Seite im Debian " "Wiki inspiriert. Mit dem Dienst können personalisierte Links zu " "Informationen im Bezug auf Debian für Debian-Mitglieder und Paketbetreuer" " erzeugt werden." -#: debianmemberportfolio/templates/base.mako:41 +#: debianmemberportfolio/templates/base.html:39 msgid "AGPL - Free Software" msgstr "AGPL - Freie Software" -#: debianmemberportfolio/templates/base.mako:43 +#: debianmemberportfolio/templates/base.html:40 #, python-format msgid "" "The service is available 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. You can 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. You can browse the" " source code or clone it from %(cloneurl)s using Transifex." msgstr "" "Dieser Dienst wird unter den Bedingungen der GNU Affero General Public " +"href=\"http://www.gnu.org/licenses/agpl.html\">GNU Affero General Public " "License, so wie sie von der Free Software Foundation veröffentlicht " "ist, bereitgestellt. Sie können entweder Version 3 oder (auf Ihren Wunsch" " hin) jede spätere Version der Lizenz verwenden. Sie können sich Transifex dazu beitragen." -#: debianmemberportfolio/templates/base.mako:44 -msgid "Copyright © 2009-2014 Jan Dittberner" -msgstr "Copyright © 2009-2014 Jan Dittberner" +#: debianmemberportfolio/templates/base.html:41 +msgid "Copyright © 2009-2015 Jan Dittberner" +msgstr "Copyright © 2009-2015 Jan Dittberner" -#: debianmemberportfolio/templates/showform.mako:24 +#: debianmemberportfolio/templates/showform.html:22 msgid "Enter your personal information" msgstr "Eingabe der persönlichen Informationen" -#: debianmemberportfolio/templates/showform.mako:30 -#: debianmemberportfolio/templates/showurls.mako:27 +#: debianmemberportfolio/templates/showform.html:29 msgid "Debian Member Portfolio" -msgstr "Debian-Mitgliederportfolio" +msgstr "Debian-Mitglieder-Portfolioservice" -#: debianmemberportfolio/templates/showform.mako:36 +#: debianmemberportfolio/templates/showform.html:31 msgid "Email address:" msgstr "E-Mailadresse:" -#: debianmemberportfolio/templates/showform.mako:47 +#: debianmemberportfolio/templates/showform.html:40 msgid "Show all form fields" msgstr "Alle Formularfelder anzeigen" -#: debianmemberportfolio/templates/showform.mako:54 +#: debianmemberportfolio/templates/showform.html:43 msgid "Name:" msgstr "Name:" -#: debianmemberportfolio/templates/showform.mako:64 +#: debianmemberportfolio/templates/showform.html:50 msgid "GPG fingerprint:" msgstr "GPG-Fingerabdruck:" -#: debianmemberportfolio/templates/showform.mako:79 +#: debianmemberportfolio/templates/showform.html:57 msgid "Debian user name:" msgstr "Debian-Benutzername:" -#: debianmemberportfolio/templates/showform.mako:94 +#: debianmemberportfolio/templates/showform.html:64 msgid "Non Debian email address:" msgstr "Nicht-Debian-E-Mailadresse" -#: debianmemberportfolio/templates/showform.mako:109 +#: debianmemberportfolio/templates/showform.html:71 msgid "Alioth user name:" msgstr "Alioth-Benutzername:" -#: debianmemberportfolio/templates/showform.mako:125 +#: debianmemberportfolio/templates/showform.html:78 msgid "Wiki user name:" msgstr "Wiki-Benutzername:" -#: debianmemberportfolio/templates/showform.mako:140 +#: debianmemberportfolio/templates/showform.html:85 msgid "Forum user id:" msgstr "Forumsbenutzernummer:" -#: debianmemberportfolio/templates/showform.mako:151 +#: debianmemberportfolio/templates/showform.html:92 msgid "Output format:" msgstr "Ausgabeformat:" -#: debianmemberportfolio/templates/showform.mako:157 -msgid "HTML" -msgstr "HTML" - -#: debianmemberportfolio/templates/showform.mako:159 -msgid "JSON" -msgstr "JSON" - -#: debianmemberportfolio/templates/showform.mako:161 +#: debianmemberportfolio/templates/showform.html:99 msgid "Build Debian Member Portfolio URLs" msgstr "Debian-Mitgliedsportfolio-URLs bauen" -#: debianmemberportfolio/templates/showurls.mako:23 +#: debianmemberportfolio/templates/showurls.html:21 msgid "Your personal links" msgstr "Ihre personalisierten Links" -#: debianmemberportfolio/templates/showurls.mako:30 +#: debianmemberportfolio/templates/showurls.html:25 +msgid "Debian Member Porfolio" +msgstr "Debian-Mitgliederportfolio" + +#: debianmemberportfolio/templates/showurls.html:28 msgid "Usage" msgstr "Verwendung" -#: debianmemberportfolio/templates/showurls.mako:30 +#: debianmemberportfolio/templates/showurls.html:28 msgid "URL" msgstr "URL" -#: debianmemberportfolio/templates/showurls.mako:40 +#: debianmemberportfolio/templates/showurls.html:38 msgid "Error during URL creation:" msgstr "Fehler bei der URL-Erzeugung:" -#: debianmemberportfolio/templates/showurls.mako:67 +#: debianmemberportfolio/templates/showurls.html:59 msgid "Restart" msgstr "Neu beginnen" +#~ msgid "Debian Logo" +#~ msgstr "Debian-Logo" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "AGPL - Free Software" +#~ msgstr "AGPL - Freie Software" + +#~ msgid "Copyright © 2009-2014 Jan Dittberner" +#~ msgstr "Copyright © 2009-2014 Jan Dittberner" + +#~ msgid "Debian Member Portfolio" +#~ msgstr "Debian-Mitgliederportfolio" + +#~ msgid "Email address:" +#~ msgstr "E-Mailadresse:" + +#~ msgid "Show all form fields" +#~ msgstr "Alle Formularfelder anzeigen" + +#~ msgid "Name:" +#~ msgstr "Name:" + +#~ msgid "GPG fingerprint:" +#~ msgstr "GPG-Fingerabdruck:" + +#~ msgid "Debian user name:" +#~ msgstr "Debian-Benutzername:" + +#~ msgid "Non Debian email address:" +#~ msgstr "Nicht-Debian-E-Mailadresse" + +#~ msgid "Alioth user name:" +#~ msgstr "Alioth-Benutzername:" + +#~ msgid "Wiki user name:" +#~ msgstr "Wiki-Benutzername:" + +#~ msgid "Forum user id:" +#~ msgstr "Forumsbenutzernummer:" + +#~ msgid "Output format:" +#~ msgstr "Ausgabeformat:" + +#~ msgid "HTML" +#~ msgstr "HTML" + +#~ msgid "JSON" +#~ msgstr "JSON" + +#~ msgid "Build Debian Member Portfolio URLs" +#~ msgstr "Debian-Mitgliedsportfolio-URLs bauen" + +#~ msgid "Your personal links" +#~ msgstr "Ihre personalisierten Links" + +#~ msgid "Usage" +#~ msgstr "Verwendung" + +#~ msgid "URL" +#~ msgstr "URL" + +#~ msgid "Error during URL creation:" +#~ msgstr "Fehler bei der URL-Erzeugung:" + +#~ msgid "Restart" +#~ msgstr "Neu beginnen" +