encode and decode for python3

tork-a · Mar 24, 2023 · 7e0907c · 7e0907c
1 parent c4b4d43
commit 7e0907c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/roswww/roswww_server.py b/src/roswww/roswww_server.py
@@ -39,6 +39,7 @@
 import base64
 import functools
 import socket
+import sys
 import tornado.ioloop  # rosbridge installs tornado
 import tornado.web
 import yaml
@@ -64,7 +65,10 @@ def new_f(*args):
             if not auth_header.startswith('Basic '):
                 return _request_auth(handler)
 
-            auth_decoded = base64.decodestring(auth_header.split(' ', 1)[1])
+            if sys.version_info.major >= 3:
+                auth_decoded = base64.decodestring(auth_header.split(' ', 1)[1].encode('ascii')).decode('utf-8')
+            else:
+                auth_decoded = base64.decodestring(auth_header.split(' ', 1)[1])
             username, password = auth_decoded.split(':', 1)
 
             if auth(username, password):