summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2013-07-17 12:24:30 -0700
committerMark Spruiell <mes@zeroc.com>2013-07-17 12:24:30 -0700
commit972b4a46d012c5304b25363e0b5d56c70f6932dc (patch)
tree8df9e149fb198fc05c27b4ba779fdb334007ea5a /py
parentRemove generated file (diff)
downloadice-972b4a46d012c5304b25363e0b5d56c70f6932dc.tar.bz2
ice-972b4a46d012c5304b25363e0b5d56c70f6932dc.tar.xz
ice-972b4a46d012c5304b25363e0b5d56c70f6932dc.zip
ICE-5375 - minor edits
Diffstat (limited to 'py')
-rwxr-xr-xpy/test/Slice/macros/Client.py10
-rw-r--r--py/test/Slice/macros/Test.ice9
2 files changed, 8 insertions, 11 deletions
diff --git a/py/test/Slice/macros/Client.py b/py/test/Slice/macros/Client.py
index 0913eb041ab..3504feddc6e 100755
--- a/py/test/Slice/macros/Client.py
+++ b/py/test/Slice/macros/Client.py
@@ -28,18 +28,18 @@ def test(b):
if not b:
raise RuntimeError('test assertion failed')
-try:
- sys.stdout.write("Testing Slice predefined macros... ")
+try:
+ sys.stdout.write("testing Slice predefined macros... ")
sys.stdout.flush()
-
+
d = Test.Default()
test(d.x == 10)
test(d.y == 10)
-
+
nd = Test.NoDefault()
test(nd.x != 10)
test(nd.y != 10)
-
+
c = Test.PythonOnly()
test(c.lang == "python")
test(c.version == Ice.intVersion())
diff --git a/py/test/Slice/macros/Test.ice b/py/test/Slice/macros/Test.ice
index 23e1db49ec6..c3091f6b99f 100644
--- a/py/test/Slice/macros/Test.ice
+++ b/py/test/Slice/macros/Test.ice
@@ -7,9 +7,8 @@
//
// **********************************************************************
-
//
-// This macro sets the default value only when compile with slice2py
+// This macro sets the default value only when compiling with slice2py.
//
#ifdef __SLICE2PY__
# define DEFAULT(X) = X
@@ -18,7 +17,7 @@
#endif
//
-// This macro sets the default value only when not compile with slice2py
+// This macro sets the default value only when not compiling with slice2py.
//
#ifndef __SLICE2PY__
# define NODEFAULT(X) = X
@@ -26,8 +25,6 @@
# define NODEFAULT(X) /**/
#endif
-
-
module Test
{
@@ -44,7 +41,7 @@ class NoDefault
};
//
-// This class is only defined when compile with slice2py.
+// This class is only defined when compiling with slice2py.
//
#ifdef __SLICE2PY__
class PythonOnly