oauth_facebook_login: python3 compatibility

bt5/erp5_oauth_facebook_login/SkinTemplateItem/portal_skins/erp5_oauth_facebook_login/ERP5Site_callbackFacebookLogin.py

@@ -21,8 +21,8 @@ elif code is not None:
     code,
     "{0}/ERP5Site_callbackFacebookLogin".format(context.absolute_url()))
   if response_dict is not None:
-    access_token = response_dict['access_token'].encode('utf-8')
-    hash_str = context.Base_getHMAC(access_token, access_token)
+    access_token = response_dict['access_token']
+    hash_str = context.Base_getHMAC(access_token.encode('utf-8'), access_token.encode('utf-8'))
 
     context.setAuthCookie(response, '__ac_facebook_hash', hash_str)
     # store timestamp in second since the epoch in UTC is enough

product/ERP5Security/ERP5ExternalOauth2ExtractionPlugin.py

@@ -39,6 +39,7 @@ from AccessControl.SecurityManagement import getSecurityManager, \
   setSecurityManager, newSecurityManager
 from Products.ERP5Type.Cache import DEFAULT_CACHE_SCOPE
 import time
+import six
 from six.moves import urllib
 import json
 from zLOG import LOG, ERROR, INFO
@@ -240,11 +241,14 @@ def getFacebookUserEntry(token):
   if facebook_entry is not None:
     # sanitise value
     for k in ('name', 'id'):
+      v = facebook_entry[k]
+      if six.PY2:
+        v = v.encode('utf-8')
       try:
         if k == 'id':
-          user_entry['reference'] = facebook_entry[k].encode('utf-8')
+          user_entry['reference'] = v
         else:
-          user_entry[k] = facebook_entry[k].encode('utf-8')
+          user_entry[k] = v
       except KeyError:
         raise ValueError(facebook_entry)
   return user_entry