Projet

Général

Profil

0001-python3-enforce-text-type-on-django-s-HttpResponse.c.patch

Paul Marillonnet, 18 avril 2019 14:38

Télécharger (4,52 ko)

Voir les différences: 

Subject: [PATCH] python3: enforce text type on django's HttpResponse.content
 (#32450)


 tests/test_all.py | 7 ++++---
 tests/test_cas.py | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
tests/test_all.py
12 12 
from django.core.serializers.json import DjangoJSONEncoder
13 13 
from django.contrib.auth import get_user_model
14 14 
from django.contrib.contenttypes.models import ContentType
15 
from django.utils.encoding import force_text
15 16 
from django.utils.translation import ugettext as _
16 17 
from django.utils.six import text_type
17 18 
from django.utils.six.moves.urllib import parse as urlparse
......
497 498 
        activation_url = get_link_from_mail(mail.outbox[-1])
498 499 
        response = client.get(activation_url)
499 500 
        self.assertEqual(response.status_code, status.HTTP_200_OK)
500 
        assert utils.make_url(return_url, params={'token': token}) in response.content
501 
        assert utils.make_url(return_url, params={'token': token}) in force_text(response.content)
501 502 
        self.assertEqual(User.objects.count(), user_count + 1)
502 503 
        response = client.get(reverse('auth_homepage'))
503 504 
        self.assertContains(response, username)
......
624 625 
        activation_url = get_link_from_mail(activation_mail1)
625 626 
        response = client.get(activation_url)
626 627 
        self.assertEqual(response.status_code, status.HTTP_200_OK)
627 
        assert utils.make_url(return_url, params={'token': token}) in response.content
628 
        assert utils.make_url(return_url, params={'token': token}) in force_text(response.content)
628 629 
        self.assertEqual(User.objects.count(), user_count + 1)
629 630 
        response = client.get(reverse('auth_homepage'))
630 631 
        self.assertContains(response, username)
......
748 749 
        activation_url = get_link_from_mail(activation_mail1)
749 750 
        response = client.get(activation_url)
750 751 
        self.assertEqual(response.status_code, status.HTTP_200_OK)
751 
        assert utils.make_url(return_url, params={'token': token}) in response.content
752 
        assert utils.make_url(return_url, params={'token': token}) in force_text(response.content)
752 753 
        self.assertEqual(User.objects.count(), user_count + 1)
753 754 
        response = client.get(reverse('auth_homepage'))
754 755 
        self.assertContains(response, username)
tests/test_cas.py
1 1 
from django.test.client import RequestFactory, Client
2 2 
from django.test.utils import override_settings
3 
from django.utils.encoding import force_text
3 4 
from django.utils.six.moves.urllib import parse as urlparse
4 5 

  		




  5
  6
  
    

  		




  ......




  69
  70
  
    
        client = Client()

  		




  70
  71
  
    
        response = client.get('/idp/cas/login')

  		




  71
  72
  
    
        self.assertEqual(response.status_code, 400)

  		




  72
  
  
    
        self.assertIn('no service', response.content)

  		




  
  73
  
    
        self.assertIn('no service', force_text(response.content))

  		




  73
  74
  
    
        response = client.get('/idp/cas/login', {constants.SERVICE_PARAM: 'http://google.com/'})

  		




  74
  75
  
    
        self.assertRedirectsComplex(response, 'http://google.com/')

  		




  75
  76
  
    
        response = client.get('/idp/cas/login', {constants.SERVICE_PARAM: self.URL,

  		




  ......




  94
  95
  
    
        response = client.post(location, {'login-password-submit': '',

  		




  95
  96
  
    
                               'username': self.LOGIN, 'password': self.PASSWORD}, follow=False)

  		




  96
  97
  
    
        response = client.get(response.url)

  		




  97
  
  
    
        self.assertIn('https://casclient.com/loser/', response.content)

  		




  
  98
  
    
        self.assertIn('https://casclient.com/loser/', force_text(response.content))

  		




  98
  99
  
    

  		




  99
  100
  
    
    def test_role_access_control_granted(self):

  		




  100
  101
  
    
        client = Client()

  		




  ......




  155
  156
  
    
            ticket_id, constants.SERVICE_PARAM: self.URL})

  		




  156
  157
  
    
        self.assertEquals(response.status_code, 200)

  		




  157
  158
  
    
        self.assertEquals(response['content-type'], 'text/plain')

  		




  158
  
  
    
        self.assertEquals(response.content, 'yes\n%s\n' % self.LOGIN)

  		




  
  159
  
    
        self.assertEquals(force_text(response.content), 'yes\n%s\n' % self.LOGIN)

  		




  159
  160
  
    
        # Verify ticket has been deleted

  		




  160
  161
  
    
        with self.assertRaises(Ticket.DoesNotExist):

  		




  161
  162
  
    
            Ticket.objects.get()

  		




  162
  
  
    
-