diff options
Diffstat (limited to 'accounts/utils')
| -rw-r--r-- | accounts/utils/__init__.py | 6 | ||||
| -rw-r--r-- | accounts/utils/confirmation.py | 4 | ||||
| -rw-r--r-- | accounts/utils/console.py | 18 | ||||
| -rw-r--r-- | accounts/utils/login.py | 2 | ||||
| -rw-r--r-- | accounts/utils/sessions.py | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py index 7e658d0..8d49363 100644 --- a/accounts/utils/__init__.py +++ b/accounts/utils/__init__.py @@ -25,7 +25,7 @@ def templated(template=None): def ensure_utf8(s): - if isinstance(s, unicode): + if isinstance(s, str): s = s.encode('utf8') return s @@ -35,9 +35,9 @@ class NotRegexp(Regexp): Like wtforms.validators.Regexp, but rejects data that DOES match the regex. """ def __call__(self, form, field): - if self.regex.match(field.data or u''): + if self.regex.match(field.data or ''): if self.message is None: - self.message = field.gettext(u'Invalid input.') + self.message = field.gettext('Invalid input.') raise ValidationError(self.message) diff --git a/accounts/utils/confirmation.py b/accounts/utils/confirmation.py index 3ae66fe..79ac7dc 100644 --- a/accounts/utils/confirmation.py +++ b/accounts/utils/confirmation.py @@ -20,6 +20,6 @@ class Confirmation(URLSafeTimedSerializer): try: return self.loads(s, max_age, return_timestamp, salt) except BadSignature: - raise Forbidden(u'Ungültiger Bestätigungslink.') + raise Forbidden('Ungültiger Bestätigungslink.') except SignatureExpired: - raise Forbidden(u'Bestätigungslink ist zu alt.') + raise Forbidden('Bestätigungslink ist zu alt.') diff --git a/accounts/utils/console.py b/accounts/utils/console.py index 8ee717f..841a78a 100644 --- a/accounts/utils/console.py +++ b/accounts/utils/console.py @@ -45,7 +45,7 @@ class TablePrinter(object): self.widths = [_column_width(column, width) for column, width - in zip(zip(*rows), self.widths)] + in zip(list(zip(*rows)), self.widths)] self._update_format_string() @@ -68,13 +68,13 @@ class TablePrinter(object): self._print_row(row) def _print_headline(self): - print('%s%s%s' % ( + print(('%s%s%s' % ( self.separator, self.separator.join(['-' * (width + 2) for width in self.widths]), - self.separator)) + self.separator))) def _print_row(self, row): - print(self.format_string % tuple(row)) + print((self.format_string % tuple(row))) class ConsoleForm(object): @@ -86,19 +86,19 @@ class ConsoleForm(object): self._ready = True def _fill(self, data): - for key, value in data.items(): + for key, value in list(data.items()): field = getattr(self.form, key, None) if field is not None: field.data = value def print_errors(self): - for field, errors in self.form.errors.items(): + for field, errors in list(self.form.errors.items()): if len(errors) > 1: - print('%s:' % field) + print(('%s:' % field)) for error in errors: - print(' %s' % error) + print((' %s' % error)) else: - print('%s: %s' % (field, errors[0])) + print(('%s: %s' % (field, errors[0]))) def __getattr__(self, name): return getattr(self.form, name) diff --git a/accounts/utils/login.py b/accounts/utils/login.py index 12e7881..71b4f59 100644 --- a/accounts/utils/login.py +++ b/accounts/utils/login.py @@ -36,7 +36,7 @@ def logout_required(f): @wraps(f) def logout_required_(*args, **kwargs): if current_user.is_authenticated(): - raise Forbidden(u'Diese Seite ist nur für nicht eingeloggte Benutzer gedacht!') + raise Forbidden('Diese Seite ist nur für nicht eingeloggte Benutzer gedacht!') return f(*args, **kwargs) return logout_required_ diff --git a/accounts/utils/sessions.py b/accounts/utils/sessions.py index 8dc8cf3..7b24f8a 100644 --- a/accounts/utils/sessions.py +++ b/accounts/utils/sessions.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import + from Crypto import Random from Crypto.Cipher import AES |