From e37142e8aaa903920d4f13a5ef66a352618e65c6 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sun, 22 May 2016 09:51:54 +0200
Subject: Replace gh_scm2newstr with scm_to_locale_string

As gh_scm2newstr is deprecated.
---
 guiletopy.c | 4 ++--
 pyguile.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guiletopy.c b/guiletopy.c
index 1850e33..84ce7d7 100644
--- a/guiletopy.c
+++ b/guiletopy.c
@@ -347,7 +347,7 @@ g2p_bignum2Long(SCM sobj,SCM stemplate)
     }
     SCM swrite_proc = scm_variable_ref(scm_c_lookup("write"));
     SCM sbignumstr = scm_object_to_string(sobj,swrite_proc);
-    char *pstr = gh_scm2newstr(sbignumstr,NULL);
+    char *pstr = scm_to_locale_string(sbignumstr);
     if (NULL == pstr) {
       scm_memory_error("g2p_bignum2Long");  // NOT COVERED BY TESTS
     }
@@ -687,7 +687,7 @@ g2p_string2String(SCM sobj,SCM stemplate)
     if (pyguile_verbosity_test(PYGUILE_VERBOSE_G2P2G_SUCCESSFUL)) {
       scm_simple_format(scm_current_output_port(),scm_makfrom0str("# g2p_string2String: successful conversion of ~S into a Python String value\n"),scm_list_1(sobj));
     }
-    PyObject *pstr = PyString_FromStringAndSize(SCM_STRING_CHARS(sobj),SCM_STRING_LENGTH(sobj));
+    PyObject *pstr = PyString_FromStringAndSize(scm_to_locale_string(sobj),SCM_STRING_LENGTH(sobj));
     if (NULL == pstr) {
       scm_memory_error("g2p_string2String");  // NOT COVERED BY TESTS
     }
diff --git a/pyguile.c b/pyguile.c
index ef7d436..003d852 100644
--- a/pyguile.c
+++ b/pyguile.c
@@ -341,7 +341,7 @@ python_eval(SCM sobj,SCM smode)
     ? Py_file_input
     : Py_eval_input;
 
-  char *pstr = gh_scm2newstr(sobj,NULL);
+  char *pstr = scm_to_locale_string(sobj);
   if (NULL == pstr) {
     scm_memory_error("python-eval");  // NOT COVERED BY TESTS
     //return(SCM_UNSPECIFIED);
@@ -414,7 +414,7 @@ python_import(SCM smodulename)
     scm_wrong_type_arg("python-import",SCM_ARG1,smodulename);
   }
   else {
-    char *mname = gh_scm2newstr(smodulename,NULL);
+    char *mname = scm_to_locale_string(smodulename);
     PyObject *pmodule = PyImport_ImportModule(mname);
     PyObject *pexception = PyErr_Occurred();
     if (pexception) {
-- 
cgit v1.2.3