Changeset 4131 for branches/2013

Timestamp:

2013-10-25T11:21:52+02:00 (11 years ago)

Author:

andrewryan

Message:

changed blank line convention in namelist parser to specify blank lines at the end of a namelist instead of the beginning.

File:

• branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/nml.py (modified) (6 diffs)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/nml.py

@@ -24 +24 @@
     >>> text = nml.update(namid, text, data)
     >>> print text
-    <BLANKLINE>
     &namfoo
        x = 1 2 3
     /
+    <BLANKLINE>
 
     In the above snippet :func:`tostring` has been used to sanitize the input
@@ -38 +38 @@
 
     >>> print nml.new("namfoo", data={"x": range(3)})
-    <BLANKLINE>
     &namfoo
        x = 0 1 2
     /
+    <BLANKLINE>
 
     Parse existing namelist
@@ -133 +133 @@
     >>> # new line join
     >>> print "\\n".join([namoff, namcl4])
-    <BLANKLINE>
     &namoff
     /
@@ -139 +138 @@
     &namcl4
     /
+    <BLANKLINE>
 
     >>> # Or addition
     >>> print namoff + namcl4
-    <BLANKLINE>
     &namoff
     /
     &namcl4
     /
+    <BLANKLINE>
 
     Module functions
@@ -453 +453 @@
 
     >>> new("namobs")
-    '\\n&namobs\\n/'
+    '&namobs\\n/\\n'
     >>> print new("namobs")
-    <BLANKLINE>
     &namobs
     /
+    <BLANKLINE>
 
     :param namid: Name for the new namelist
@@ -468 +468 @@
     :returns: string representation of a Fortran namelist
     """
-    text = "\n&{namid}\n/".format(namid=namid)
+    text = "&{namid}\n/\n".format(namid=namid)
     if data is not None:
         text = update(namid, text, data, convert=convert)