From 5fae100c698ded37db412c405631ac831ef35572 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Tue, 22 Nov 2011 15:52:14 +0000
Subject: [PATCH] Maintain backwards compatability with older version of Jython on Unicode
---
opends/tests/staf-tests/shared/functions/utils.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index a42affe..58a1423 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -298,8 +298,7 @@
</script>
<!-- Check that returnString is really a string or unicode -->
- <if expr='returnString.__class__ is not PyString
- and returnString.__class__ is not PyUnicode'>
+ <if expr='value_not_string(returnString)'>
<sequence>
<message log="1" level="'Error'">
'Invalid returnString type (%s), requires str or unicode.' \
@@ -415,8 +414,7 @@
</script>
<!-- Check that returnString is really a string -->
- <if expr='returnString.__class__ is not PyString
- and returnString.__class__ is not PyUnicode'>
+ <if expr='value_not_string(returnString)'>
<sequence>
<message log="1" level="'Error'">
'ERROR : Invalid returnString type (%s), requires str or unicode.' \
--
Gitblit v1.10.0