gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

bump dependency versions, fix tests and deprecation warnings

Browse source
This commit is contained in:
Jan Dittberner 2015-10-11 15:30:23 +02:00
parent 68170f7576
commit 8ebb5cad6a
5 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnuviechadmin/managemails/admin.py
View file

@ -1,7 +1,7 @@
from django.utils.html import format_html from django.utils.html import format_html
from django.contrib import admin from django.contrib import admin
from django import forms from django import forms
from django.forms.util import flatatt from django.forms.utils import flatatt
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from .models import ( from .models import (

5
gnuviechadmin/osusers/models.py
View file

@ -533,7 +533,10 @@ class SshPublicKeyManager(models.Manager):
raise ValueError('invalid SSH public key') raise ValueError('invalid SSH public key')
data = parts[1] data = parts[1]
comment = len(parts) == 3 and parts[2] or "" comment = len(parts) == 3 and parts[2] or ""
keybytes = base64.b64decode(data) try:
keybytes = base64.b64decode(data)
except TypeError:
raise ValueError('invalid SSH public key')
parts = keybytes.split(b'\x00' * 3) parts = keybytes.split(b'\x00' * 3)
alglength = six.byte2int(parts[1]) alglength = six.byte2int(parts[1])
algname = parts[1][1:1+alglength] algname = parts[1][1:1+alglength]

30
requirements/base.txt
View file

@ -1,18 +1,18 @@
Django==1.7.4 Django==1.8.5
bpython==0.13.1 bpython==0.14.2
django-braces==1.4.0 django-braces==1.8.1
django-model-utils==2.2 django-model-utils==2.3.1
django-crispy-forms==1.4.0 django-crispy-forms==1.5.2
logutils==0.3.3 logutils==0.3.3
psycopg2==2.5.4 psycopg2==2.6.1
passlib==1.6.2 passlib==1.6.5
celery==3.1.17 celery==3.1.18
billiard==3.3.0.19 billiard==3.3.0.20
kombu==3.0.24 kombu==3.0.27
pytz==2014.10 pytz==2015.6
pyaml==14.12.10 pyaml==15.8.2
django-allauth==0.19.0 django-allauth==0.21.0
oauthlib==0.7.2 oauthlib==1.0.3
python-openid==2.2.5 python-openid==2.2.5
requests==2.5.1 requests==2.5.1
requests-oauthlib==0.4.2 requests-oauthlib==0.5.0

11
requirements/local.txt
View file

@ -1,8 +1,7 @@
# Local development dependencies go here # Local development dependencies go here
-r base.txt -r test.txt
coverage==3.7.1 django-debug-toolbar==1.4
mock==1.0.1 sqlparse==0.1.16
django-debug-toolbar==1.2.2 Sphinx==1.3.1
sqlparse==0.1.14 snowballstemmer==1.2.0
Sphinx==1.2.3
releases==0.7.0 releases==0.7.0

4
requirements/test.txt
View file

@ -1,4 +1,4 @@
# Test dependencies go here. # Test dependencies go here.
-r base.txt -r base.txt
coverage==3.7.1 coverage==4.0
mock==1.0.1 mock==1.3.0