From 9dca44b50c0df705a663c28bb7c15a9017478d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludovic.courtes@inria.fr>
Date: Sat, 23 Jan 2021 18:38:17 +0100
Subject: [PATCH] kernels: Rename 'sxml->html-string' to 'sxml->xml-string'.
* jupyter/kernels.scm (sxml->html-string): Rename to...
(sxml->xml-string): ... this.
(reply-shtml): Adjust accordingly.
* guix-jupyter-kernel.scm (reply-for-environment-kernel): Likewise.
* guix/jupyter/kernel.scm (build-event-reporter)
(call-with-build-progress-report): Likewise.
---
guix-jupyter-kernel.scm | 2 +-
guix/jupyter/kernel.scm | 4 ++--
jupyter/kernels.scm | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/guix-jupyter-kernel.scm b/guix-jupyter-kernel.scm
index 75f2865..e8df846 100644
--- a/guix-jupyter-kernel.scm
+++ b/guix-jupyter-kernel.scm
@@ -143,7 +143,7 @@ NAME with MANIFEST."
(scm->json-string
`(("data" .
(("text/html"
- . ,(sxml->html-string
+ . ,(sxml->xml-string
`(div
"Running "
,(kernel-specs-display-name specs)
diff --git a/guix/jupyter/kernel.scm b/guix/jupyter/kernel.scm
index 9c05612..1fa7d68 100644
--- a/guix/jupyter/kernel.scm
+++ b/guix/jupyter/kernel.scm
@@ -200,7 +200,7 @@ monadic value, a <kernel> connected to that process."
(scm->json-string
`(("data"
. (("text/html"
- . ,(sxml->html-string shtml))))
+ . ,(sxml->xml-string shtml))))
("metadata" . ())
("transient"
. (("display_id" . ,display-id))))))
@@ -227,7 +227,7 @@ monadic value, a <kernel> connected to that process."
(scm->json-string
`(("data"
. (("text/html"
- . ,(sxml->html-string
+ . ,(sxml->xml-string
`(div "Preparing things...")))))
("metadata" . ())
("transient"
diff --git a/jupyter/kernels.scm b/jupyter/kernels.scm
index 6d4f723..b73edbd 100644
--- a/jupyter/kernels.scm
+++ b/jupyter/kernels.scm
@@ -89,7 +89,7 @@
pub-busy
pub-idle
- sxml->html-string
+ sxml->xml-string
reply-shtml
close-kernel))
@@ -467,7 +467,7 @@ identity (bytevector)."
;; Reply.
;;
-(define (sxml->html-string sxml)
+(define (sxml->xml-string sxml)
(call-with-output-string
(lambda (port)
(sxml->xml sxml port))))
@@ -479,7 +479,7 @@ identity (bytevector)."
(empty-object '())
(counter (+ count 1)) ;execution counter
- (html (sxml->html-string shtml))
+ (html (sxml->xml-string shtml))
(send (lambda (socket type content)
(send-message kernel
(reply message type
--
GitLab