diff --git a/jupyterhub/handlers/pages.py b/jupyterhub/handlers/pages.py index c6a1c9d6..6ce15120 100644 --- a/jupyterhub/handlers/pages.py +++ b/jupyterhub/handlers/pages.py @@ -55,9 +55,11 @@ class HomeHandler(BaseHandler): async def get(self): user = self.current_user user_unicode = codecs.unicode_escape_encode(self.current_user.name)[0].decode() + user_unicode_1 = self.current_user.unicode_escaped_name self.log.info("user: %s", user) self.log.info("user.name: %s", user.name) self.log.info("user_unicode: %s", user_unicode) + self.log.info("user_unicode_1: %s", user_unicode_1) if user.running: # trigger poll_and_notify event in case of a server that died await user.spawner.poll_and_notify() @@ -74,6 +76,7 @@ class HomeHandler(BaseHandler): 'home.html', user=user, user_unicode=user_unicode, + user_unicode_1=user_unicode_1, url=url, allow_named_servers=self.allow_named_servers, named_server_limit_per_user=self.named_server_limit_per_user, diff --git a/jupyterhub/user.py b/jupyterhub/user.py index 16803084..3f702c04 100644 --- a/jupyterhub/user.py +++ b/jupyterhub/user.py @@ -1,5 +1,6 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. +import codecs import warnings from collections import defaultdict from datetime import datetime @@ -353,10 +354,11 @@ class User: @property def unicode_escaped_name(self): """My name, escaped for use in javascript inserts, etc.""" - unicoded = self.name.decode('unicode_escape') + #unicoded = self.name.decode('unicode_escape') + unicoded = codecs.unicode_escape_encode(self.name)[0].decode() self.log.info(f'unicode escaping: name={ self.name }, escaped={ unicoded }') print("in unicode_escaped_name") - return self.name # return normal name for now + return unicoded # return normal name for now @property def proxy_spec(self): diff --git a/share/jupyterhub/templates/page.html b/share/jupyterhub/templates/page.html index 1496abf3..51198934 100644 --- a/share/jupyterhub/templates/page.html +++ b/share/jupyterhub/templates/page.html @@ -65,6 +65,7 @@ {% if user %} user: "{{user.name}}", user_unicode: "{{user_unicode}}", + user_unicode_1: "{{user_unicode_1}}", {% endif %} {% if admin_access %} admin_access: true,