summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2016-07-05 08:33:29 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2016-07-05 08:33:29 +0200
commite263a11eeb08443ebfd7bf3fa70f4ceb543b44b0 (patch)
tree84797a274ffa808b73998e18d403157ff0666708
parent23a8a11f0d21cc1b7fb27752c20980b942fa5200 (diff)
downloadkosten-e263a11eeb08443ebfd7bf3fa70f4ceb543b44b0.tar.gz
kosten-e263a11eeb08443ebfd7bf3fa70f4ceb543b44b0.tar.bz2
kosten-e263a11eeb08443ebfd7bf3fa70f4ceb543b44b0.zip
First batch of py3 changes
-rw-r--r--__init__.py2
-rw-r--r--app/forms.py2
-rw-r--r--app/model.py1
-rw-r--r--app/views/consts.py2
-rw-r--r--app/views/expenses.py2
-rw-r--r--app/views/user.py4
-rwxr-xr-xmanage.py2
7 files changed, 7 insertions, 8 deletions
diff --git a/__init__.py b/__init__.py
index d099b92..c07c459 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1 +1 @@
-from app import app
+from .app import app
diff --git a/app/forms.py b/app/forms.py
index 0bbb745..cdd801f 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -16,7 +16,7 @@ class DecimalField(fields.DecimalField):
def process_formdata(self, valuelist):
if valuelist:
value = valuelist[0].replace(',','.')
- super(DecimalField, self).process_formdata([value])
+ super().process_formdata([value])
req = [validators.input_required()]
diff --git a/app/model.py b/app/model.py
index 5ae2ead..b68dc57 100644
--- a/app/model.py
+++ b/app/model.py
@@ -173,7 +173,6 @@ class MonthExpense (namedtuple('MonthExpense', 'user date catexps')):
def __init__ (self, *args, **kwargs):
self._consts = None
- super(MonthExpense, self).__init__(*args, **kwargs)
@property
def consts (self):
diff --git a/app/views/consts.py b/app/views/consts.py
index 9ffd757..53616a4 100644
--- a/app/views/consts.py
+++ b/app/views/consts.py
@@ -52,7 +52,7 @@ class ConstForm(F.Form):
def __init__(self, cur=None, obj=None):
obj = cur if obj is None else obj
- super(ConstForm, self).__init__(obj=obj)
+ super().__init__(obj=obj)
self.category.query = Category.of(current_user).order_by(Category.name)
# init prev_list
diff --git a/app/views/expenses.py b/app/views/expenses.py
index 2a5bd32..30a6830 100644
--- a/app/views/expenses.py
+++ b/app/views/expenses.py
@@ -33,7 +33,7 @@ class ExpenseForm(F.Form):
get_label='name')
def __init__(self, obj = None, description_req = True):
- super(ExpenseForm, self).__init__(obj = obj)
+ super().__init__(obj = obj)
self.category.query = Category.of(current_user).order_by(Category.name)
if description_req:
diff --git a/app/views/user.py b/app/views/user.py
index cb97136..2a8730d 100644
--- a/app/views/user.py
+++ b/app/views/user.py
@@ -19,11 +19,11 @@ class LoginForm(F.Form):
remember = F.BooleanField(u'Eingeloggt bleiben?')
def __init__(self, *args, **kwargs):
- super(LoginForm, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.user = None
def validate(self):
- rv = super(LoginForm, self).validate()
+ rv = super().validate()
if not rv:
return False
diff --git a/manage.py b/manage.py
index 823422f..9efe083 100755
--- a/manage.py
+++ b/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3 -B
# -*- coding: utf-8 -*-
import sys