From 23f3c781414ac790accd3f90f42b6db27aa86e0f Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 20 Aug 2017 21:10:27 +0200
Subject: [PATCH] Fix unused arguments, remove Pylons websetup

---
 debianmemberportfolio/forms.py    |  2 +-
 debianmemberportfolio/views.py    | 11 ++++----
 debianmemberportfolio/websetup.py | 46 -------------------------------
 requirements.txt                  | 11 ++++++++
 setup.py                          |  3 +-
 5 files changed, 20 insertions(+), 53 deletions(-)
 delete mode 100644 debianmemberportfolio/websetup.py
 create mode 100644 requirements.txt

diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py
index 530f134..4c9612e 100644
--- a/debianmemberportfolio/forms.py
+++ b/debianmemberportfolio/forms.py
@@ -14,7 +14,7 @@ class FingerPrint(Regexp):
 
 
 class PlainText(Regexp):
-    def __init__(self, **kwargs):
+    def __init__(self):
         super(PlainText, self).__init__(r'^[a-zA-Z\-0-9]*$')
 
 
diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py
index ab80d57..fe483f6 100644
--- a/debianmemberportfolio/views.py
+++ b/debianmemberportfolio/views.py
@@ -25,7 +25,8 @@ import logging
 
 from debianmemberportfolio import app, babel
 from flask import g, make_response, request, render_template, abort
-from flask_babel import lazy_gettext as N_
+# noinspection PyPep8Naming
+from flask.ext.babel import lazy_gettext as N_
 from config import LANGUAGES
 from .forms import DeveloperData, DeveloperDataRequest
 from .model import dddatabuilder
@@ -109,7 +110,7 @@ developer name on all bug logs)'),
         'label': N_('Information reachable via ssh (for Debian Members)'),
         'owndndoms': N_('owned debian.net domains'),
         'miainfo': N_('<a href="https://wiki.debian.org/qa.debian.org/'
-                        'MIATeam">MIA</a> database information'),
+                      'MIATeam">MIA</a> database information'),
         'groupinfo': N_('Group membership information'),
     },
     'ubuntu': {
@@ -120,12 +121,12 @@ developer name on all bug logs)'),
 
 #: list of field name tuples for Debian Maintainers
 DM_TUPLES = (('name', 'name'),
-                ('gpgfp', 'gpgfp'),
-                ('nonddemail', 'email'))
+             ('gpgfp', 'gpgfp'),
+             ('nonddemail', 'email'))
 
 #: list of field name tuples for Debian Developers
 DD_TUPLES = (('username', 'username'),
-                ('aliothusername', 'username'))
+             ('aliothusername', 'username'))
 
 
 def _get_label(section, url=None):
diff --git a/debianmemberportfolio/websetup.py b/debianmemberportfolio/websetup.py
deleted file mode 100644
index e7b87af..0000000
--- a/debianmemberportfolio/websetup.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- python -*-
-# -*- coding: utf-8 -*-
-#
-# Debian Member Portfolio Service websetup
-#
-# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info>
-#
-# 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 <https://www.gnu.org/licenses/>.
-#
-"""
-Setup the debianmemberportfolio application
-
-"""
-
-import logging
-
-from paste.deploy import appconfig
-import pylons.test
-
-from debianmemberportfolio.config.environment import load_environment
-
-log = logging.getLogger(__name__)
-
-
-def setup_config(command, filename, section, vars):
-    """
-    Place any commands to setup debianmemberportfolio here
-
-    """
-    conf = appconfig('config:' + filename)
-
-    if not pylons.test.pylonsapp:
-        load_environment(conf.global_conf, conf.local_conf)
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..959456a
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+Flask==0.10.1
+Jinja2==2.8
+MarkupSafe==0.23
+Werkzeug==0.10.4
+itsdangerous==0.24
+Babel==2.1.1
+Flask-Babel==0.9
+pytz==2012c
+speaklater==1.3
+Flask-WTF==0.12
+WTForms==2.0.2
diff --git a/setup.py b/setup.py
index 2a40f15..afae690 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@
 try:
     from setuptools import setup, find_packages
 except ImportError:
+    # noinspection PyUnresolvedReferences
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup, find_packages
@@ -46,7 +47,7 @@ setup(
     author_email='jan@dittberner.info',
     url='http://debian-stuff.dittberner.info/debianmemberportfolio',
     license='AGPL-3.0+',
-    install_requires=["Flask>=0.10.1", 'Babel>=1.3', 'Flask-Babel>=0.9'],
+    install_requires=["Flask>=0.10.1", 'Babel>=1.3', 'Flask-Babel>=0.9', 'wtforms'],
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
     test_suite='nose.collector',