# HG changeset patch
# User Rémi Cardona <remi.cardona@logilab.fr>
# Date 1442412124 -7200
# Node ID 14e7ddb0f670d4a947c85b75dde8e9dbde322779
# Parent  af266f27c4d5068c2ede9b277347ef4d7fdb9055
[py3k] unicode → six.text_type

diff -r af266f27c4d5 -r 14e7ddb0f670 web/webconfig.py
--- a/web/webconfig.py	Wed Sep 16 15:26:56 2015 +0200
+++ b/web/webconfig.py	Wed Sep 16 16:02:04 2015 +0200
@@ -26,6 +26,8 @@
 from os.path import join, exists, split, isdir
 from warnings import warn
 
+from six import text_type
+
 from logilab.common.decorators import cached, cachedproperty
 from logilab.common.deprecation import deprecated
 from logilab.common.configuration import merge_options
@@ -293,7 +295,7 @@
             user   = self['anonymous-user'] or None
             passwd = self['anonymous-password']
             if user:
-                user = unicode(user)
+                user = text_type(user)
         except KeyError:
             user, passwd = None, None
         except UnicodeDecodeError:
@@ -305,17 +307,17 @@
         """This random key/salt is used to sign content to be sent back by
         browsers, eg. in the error report form.
         """
-        return str(uuid4())
+        return str(uuid4()).encode('ascii')
 
     def sign_text(self, text):
         """sign some text for later checking"""
         # hmac.new expect bytes
-        if isinstance(text, unicode):
+        if isinstance(text, text_type):
             text = text.encode('utf-8')
         # replace \r\n so we do not depend on whether a browser "reencode"
         # original message using \r\n or not
         return hmac.new(self._instance_salt,
-                        text.strip().replace('\r\n', '\n')).hexdigest()
+                        text.strip().replace(b'\r\n', b'\n')).hexdigest()
 
     def check_text_sign(self, text, signature):
         """check the text signature is equal to the given signature"""