Skip to content

Commit 46cfa17

Browse files
committed
Minor fixes, use $$$NL to replace $c(10) in Python output
1 parent 02ce052 commit 46cfa17

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

isc/py/Main.cls

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ClassMethod SimpleString(code As %String = "", variable As %String = "", seriali
2727

2828
set sc1 = ..GetStatus()
2929

30-
set:$$$ISERR(sc1) sc2 = $$$ERROR($$$GeneralError, $$$FormatText("code: %1, variable: %2, serialization: %3, result: %4", $replace(code, $c(10), $c(10,13)), variable, serialization, $g(result)))
30+
set:$$$ISERR(sc1) sc2 = $$$ERROR($$$GeneralError, $$$FormatText("code: %1, variable: %2, serialization: %3, result: %4", $replace(code, $c(10), $$$NL), variable, serialization, $g(result)))
3131

3232
set sc = $$$ADDSC(sc2, $$$ADDSC(sc, sc1))
3333

@@ -93,7 +93,7 @@ ClassMethod ExecuteCode(code As %Stream.Object, variable As %String = "") As %St
9393
} else {
9494
set errorCode = $e(code, 1, 1000)
9595
}
96-
set sc = $$$ADDSC(sc, $$$ERROR($$$GeneralError, $$$FormatText("code: %1, variable: %2", $replace(errorCode, $c(10), $c(10,13)), variable)))
96+
set sc = $$$ADDSC(sc, $$$ERROR($$$GeneralError, $$$FormatText("code: %1, variable: %2", $replace(errorCode, $c(10), $$$NL), variable)))
9797
}
9898

9999

@@ -571,7 +571,7 @@ ClassMethod GetStatus() As %Status
571571
quit:haxExc="False"
572572

573573
set excText = ##class(isc.py.Callout).SimpleString("zzzerr = traceback.format_exception(sys.last_type, sys.last_value, sys.last_traceback)", "zzzerr")
574-
set excText = $replace($zcvt(excText, "I", "JSON"), $c(10), $c(10,13))
574+
set excText = $replace($zcvt(excText, "I", "JSON"), $c(10), $$$NL)
575575
do ##class(isc.py.Callout).SimpleString("del zzzerr, sys.last_type, sys.last_value, sys.last_traceback")
576576
set sc = $$$ERROR($$$GeneralError, excText)
577577
} catch ex {

isc/py/init/Test.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Class isc.py.init.Test Extends isc.py.init.Abstract
44
{
55

6-
Parameter Modules = {$lb("types", "json", $lb("pandas", "pd"), "inspect", "random")};
6+
Parameter Modules = {$lb("types", "json", "inspect", "random")};
77

88
ClassMethod InitCube() As %Status [ CodeMode = expression ]
99
{

isc/py/test/Process.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ plt.close(f)]]></annotation>
103103
<annotation><![CDATA[def cube(x):
104104
return x*x*x]]></annotation>
105105
<request type='isc.py.msg.ExecutionRequest' >
106-
<assign property="callrequest.Code" value="process.GetAnnotation(&quot;Define user function&quot;) " action="set" />
106+
<assign property="callrequest.Code" value="process.GetAnnotation(&quot;Define user function&quot;)" action="set" />
107107
<assign property="callrequest.SeparateLines" value="0" action="set" />
108108
</request>
109109
<response type='Ens.Response' />

isc/py/util/BPEmulator.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ClassMethod DescribeDataframe(variable) As %Status
106106
{
107107
set sc = ##class(isc.py.Main).SimpleString("zzzinfo=" _ variable _ ".dtypes", "zzzinfo", , .zzzinfo)
108108
quit:$$$ISERR(sc) sc
109-
write $replace(zzzinfo,$c(10),$c(10,13))
109+
write $replace(zzzinfo, $c(10), $$$NL)
110110
set sc = ##class(isc.py.Main).SimpleString("del zzzinfo")
111111
quit sc
112112
}

isc/py/util/Shell.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ClassMethod Shell()
2323
}
2424
}
2525
if sc {
26-
write $g(result)
26+
write $replace($g(result), $c(10), $$$NL)
2727
} else {
2828
write $System.Status.GetErrorText(sc)
2929
}

0 commit comments

Comments
 (0)