replace unicode() calls by force_text() (#38923)

passerelle/apps/atal/models.py

@@ -18,6 +18,7 @@ import base64
 
 from django.db import models
 from django.utils import dateformat
+from django.utils.encoding import force_text
 from django.utils.six.moves import urllib
 from django.utils.translation import ugettext_lazy as _
 import lxml.etree
@@ -54,7 +55,7 @@ class ATALConnector(BaseResource):
         try:
             return getattr(client.service, method)(**kwargs)
         except Fault as e:
-            raise APIError(unicode(e))
+            raise APIError(force_text(e))
 
     def _basic_ref(self, wsdl, method):
         soap_res = self._soap_call(wsdl=wsdl, method=method)

passerelle/apps/family/loaders/concerto_fondettes.py

@@ -24,12 +24,13 @@ import sys
 import zipfile
 
 from django.core.exceptions import ValidationError
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from ..models import Invoice
 
 def u(s):
-    return unicode(s, 'iso-8859-15')
+    return force_text(s, 'iso-8859-15')
 
 class Loader(object):
     def __init__(self, connector):

passerelle/apps/gdc/models.py

@@ -10,6 +10,7 @@ except ImportError:
 
 from django.core.urlresolvers import reverse
 from django.db import models
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -36,7 +37,7 @@ class Gdc(BaseResource):
         soap_result = phpserialize_loads(server.getListeCommune()['listeCommune'])
         result = []
         for k, v in soap_result.items():
-            result.append({'id': k, 'text': unicode(v, 'utf-8')})
+            result.append({'id': k, 'text': force_text(v, 'utf-8')})
         result.sort(lambda x,y: cmp(x['id'], y['id']))
         return result
 
@@ -46,6 +47,6 @@ class Gdc(BaseResource):
         soap_result = phpserialize_loads(server.getListeObjet()['listeObjet'])
         result = []
         for k, v in soap_result.items():
-            result.append({'id': k, 'text': unicode(v, 'utf-8')})
+            result.append({'id': k, 'text': force_text(v, 'utf-8')})
         result.sort(lambda x,y: cmp(x['id'], y['id']))
         return result

passerelle/apps/ovh/models.py

@@ -2,6 +2,7 @@ import requests
 
 from django.utils.translation import ugettext_lazy as _
 from django.db import models
+from django.utils.encoding import force_text
 
 from passerelle.utils.jsonresponse import APIError
 from passerelle.base.models import BaseResource
@@ -87,7 +88,7 @@ class OVHSMSGateway(BaseResource, SMSGatewayMixin):
                                           self.default_country_code,
                                           self.default_trunk_prefix)
 
-        text = unicode(text).encode('utf-8')
+        text = force_text(text).encode('utf-8')
         to = ','.join(destinations)
         params = {
             'account': self.account.encode('utf-8'),

passerelle/apps/solis/models.py

@@ -39,8 +39,7 @@ def simplify(s):
     '''
     if not s:
         return ''
-    if not isinstance(s, unicode):
-        s = unicode(s, 'utf-8', 'ignore')
+    s = force_text(s, 'utf-8', 'ignore')
     s = unicodedata.normalize('NFKD', s).encode('ascii', 'ignore')
     s = re.sub(r'[^\w\s\'-]', '', s)
     s = re.sub(r'[\s\'_-]+', ' ', s)

passerelle/contrib/iparapheur/models.py

@@ -18,6 +18,7 @@ import urllib
 
 from requests.exceptions import ConnectionError
 from django.db import models
+from django.utils.encoding import force_text
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponse, Http404
@@ -67,7 +68,7 @@ CREATE_FILE_SCHEMA = {
 
 
 def format_type(t):
-    return {'id': unicode(t), 'text': unicode(t)}
+    return {'id': force_text(t), 'text': force_text(t)}
 
 def format_file(f):
     return {'status': f.status, 'id': f.nom, 'timestamp': f.timestamp}

passerelle/contrib/nancypoll/models.py

@@ -2,6 +2,7 @@ import csv
 
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -13,7 +14,7 @@ COLUMN_NAMES = 'street_start_number, street_end_number,,,street_side,,,,code,id,
 
 
 def to_unicode(value):
-    return unicode(value, 'utf-8')
+    return force_text(value, 'utf-8')
 
 
 class NancyPoll(BaseResource):

passerelle/contrib/strasbourg_eu/models.py

@@ -19,6 +19,7 @@ import json
 import urlparse
 
 from django.db import models
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -86,7 +87,7 @@ class StrasbourgEu(BaseResource):
                 notification['parsedPublicationDate'] = None
                 for date_format in ('%Y-%m-%d %H:%M:%S', '%a %b %d %H:%M:%S %Z %Y'):
                     try:
-                        notification['parsedPublicationDate'] = unicode(
+                        notification['parsedPublicationDate'] = force_text(
                             datetime.datetime.strptime(notification['publicationDate'], date_format))
                         break
                     except ValueError:

passerelle/pbx/models.py

@@ -3,6 +3,7 @@ import logging
 
 from django.db import models
 from django.conf import settings
+from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 import requests
@@ -30,9 +31,9 @@ class PBXMixin(BaseResource):
         assert isinstance(caller, basestring)
         assert isinstance(callee, basestring)
         assert not data or isinstance(data, dict)
-        caller = unicode(caller)
-        callee = unicode(callee)
-        event = unicode(event)
+        caller = force_text(caller)
+        callee = force_text(callee)
+        event = force_text(event)
 
         payload = {
             'event': event,

passerelle/soap.py

@@ -2,6 +2,7 @@ import os.path
 import StringIO
 import urlparse
 
+from django.utils.encoding import force_text
 import requests
 from suds.client import Client
 from suds.transport.http import HttpAuthenticated
@@ -135,7 +136,7 @@ def client_to_jsondict(client):
         d['types'] = {}
         for t in sd.types:
             ft = client.factory.create(sd.xlate(t[0]))
-            d['types'][sd.xlate(t[0])] = unicode(ft)
+            d['types'][sd.xlate(t[0])] = force_text(ft)
         res[sd.service.name] = d
     return res
 

passerelle/utils/conversion.py

@@ -21,6 +21,7 @@ import warnings
 from StringIO import StringIO
 
 from django.utils import six
+from django.utils.encoding import force_text
 
 import unidecode
 from PIL import Image
@@ -101,8 +102,7 @@ def simplify(s):
     '''
     if not s:
         return ''
-    if not isinstance(s, unicode):
-        s = unicode(s, 'utf-8', 'ignore')
+    s = force_text(s, 'utf-8', 'ignore')
     s = unicodedata.normalize('NFKD', s).encode('ascii', 'ignore')
     s = re.sub(r'[^\w\s\'-]', '', s)
     s = re.sub(r'[\s\'_-]+', ' ', s)