]>
Commit | Line | Data |
---|---|---|
27c5a0ad JB |
1 | --- WTForms-2.1/tests/ext_django/tests.py.orig 2015-12-14 22:37:32.000000000 +0100 |
2 | +++ WTForms-2.1/tests/ext_django/tests.py 2018-05-26 20:58:32.424304869 +0200 | |
3 | @@ -33,10 +33,10 @@ | |
4 | } | |
5 | }, | |
6 | # this fixes warnings in django 1.7 | |
7 | - MIDDLEWARE_CLASSES = [ | |
8 | - 'django.contrib.sessions.middleware.SessionMiddleware', | |
9 | - 'django.contrib.auth.middleware.AuthenticationMiddleware', | |
10 | - 'django.contrib.messages.middleware.MessageMiddleware', | |
11 | + MIDDLEWARE_CLASSES=[ | |
12 | + 'django.contrib.sessions.middleware.SessionMiddleware', | |
13 | + 'django.contrib.auth.middleware.AuthenticationMiddleware', | |
14 | + 'django.contrib.messages.middleware.MessageMiddleware', | |
15 | ] | |
16 | ) | |
17 | ||
18 | --- WTForms-2.1/wtforms/ext/sqlalchemy/fields.py.orig 2014-12-18 11:55:24.000000000 +0100 | |
19 | +++ WTForms-2.1/wtforms/ext/sqlalchemy/fields.py 2018-05-26 21:21:58.377622148 +0200 | |
20 | @@ -186,5 +186,5 @@ | |
21 | ||
22 | ||
23 | def get_pk_from_identity(obj): | |
24 | - cls, key = identity_key(instance=obj) | |
25 | - return ':'.join(text_type(x) for x in key) | |
26 | + key_vals = identity_key(instance=obj) | |
27 | + return ':'.join(text_type(x) for x in key_vals[1]) |